[automerger skipped] Merge "Mark ab/8191998 as merged" into android12L-tests-dev am: c962e4316e -s ours am: 4d6896caf6 -s ours

am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244

Change-Id: I6af25b2eae1fd2d34485d5bf8489332c119531e9