Snap for 8746455 from c618f7c01e83409e57f3e74bdc1fd4bdc6a828b5 to tm-release am: 88baac34da

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

Change-Id: I30db0eb73394d13afacc8dc7497f91b148d0f04b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>