[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0500a76f00 -s ours am: 7b293db127 -s ours am: 3b66729c00 -s ours am: 1ec54cd3f2 -s ours

am skip reason: Merged-In I27ef01734a4cba57b8d04642984a96fdce299585 with SHA-1 543f2c338c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/hamcrest/+/15571805

Change-Id: I7e49855e83b589649a4101065f95b6a8536806ee