Merge tag v0.5.9 am: 380e26f982 am: 8bddf39794

Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2320808

Change-Id: I6ba5921fc86e3fcb4fb47823cdd9f8332f16d496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>