[automerger skipped] Merge ab/7633965 am: 54fd5f77b8 -s ours

am skip reason: Merged-In Icb57ed5eb6b8976ecf6ac88bf8c278bbe144b450 with SHA-1 7b4fead5e9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15547191

Change-Id: I4693bbddd0d7a320591dbb53f60f3b22b04ee659