[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours

am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118

Change-Id: I29861d676ece6d2a1dbd81a93d23a8e6a90f08e0