[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -s ours am: fde26bfc52 -s ours am: 56516f92a7 -s ours am: acfb306cd5 -s ours am: df8e88e8d8 -s ours

am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history

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

Change-Id: I4e66c8d5c5ed2756c3049255a14bfc6220b19a95