[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 15102145b8 -s ours

am skip reason: Change-Id I40cfe81c9f4550afd79d20772cdb685edae39b73 with SHA-1 9c1a46a8e4 is in history

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

Change-Id: Ie8b9c0c57ae04635b3508b9207d119e54a842da5