[automerger skipped] Merge SP1A.211205.008 am: eb04396a6f am: fa90c5a28f -s ours am: 0011dd57eb -s ours

am skip reason: Merged-In I49e5f7c9e1cfbb6cb7250f295cbf3908007faf42 with SHA-1 dc3cb510a7 is already in history

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

Change-Id: I98fecf998094a384d92224b1589c598f5440fb96
tree: dcead6a34c1e514ee0ae5792d7f7b8a79fe11bf1
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS