Snap for 8451773 from e79595cdabdc11e465e17634098987cd6475f169 to tm-qpr1-release am: 874694a6ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/runtime/+/17752317

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