[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: 12cbb02ed8 -s ours am: 80cb71c3f4 -s ours

am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history

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

Change-Id: Id5fa044fda3d8a1a42897a567b68fb60b34b9b97