[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours

am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history

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

Change-Id: Ie732ca775c26997ca35a790c9b44f66a843cd83b