[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am:...

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ef1e3405 -s ours am: 1e8e1639 -s ours am: d5e5fb59 -s ours

am skip reason: Merged-In I92c020098293b42b3218ba67d55726e23c0b4835 with SHA-1 0dd4839e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/16278967

Change-Id: I181b66716ec99fa02dd05bcc8e5dc42ac238015c