Snap for 8562897 from 9e38bf90406e422304b60d06f3256dd5d02677cf to tm-qpr1-release am: df6dc57880

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

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