[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 48bc163b -s ours am: 588cc241 -s ours am: fc267bc5 -s ours

am skip reason: Merged-In If5df241d2b7f6c5497133b83f7c014e0f79f9fb4 with SHA-1 9ce51cb3 is already in history

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



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