Merge cherrypicks of [19097922] into tm-release. am: bcb7a97f08

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

Change-Id: I8bb5568b9d8a38bb4a70bcb30c365424abd45e2a
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: e059d6eb58e8b6397907895e706f2b29a05ce201
  1. .prebuilt_info/
  2. 1/
  3. 2/
  4. 3/
  5. current/
  6. OWNERS