[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 2389374e68 -s ours am: 2cfc5c4682 -s ours

am skip reason: Merged-In I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360 with SHA-1 5ffe5cf5ba is already in history

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

Change-Id: I9a2eae9ac1c27a3f4473ef779bb6079a618350df