Snap for 8414339 from 26679ad0b21b5e7495d5d702e6ee41d857f072bf to tm-qpr1-release am: b672652cd4

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

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