[automerger skipped] Merge SP1A.211205.008 am: b9d59dd677 am: dc49ac1d7d -s ours am: f22d7c86a5 -s ours

am skip reason: Merged-In Ife94aecc90564f364e629ee1d30f9f6a0feda6e6 with SHA-1 155f9c01ab is already in history

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

Change-Id: I00b79c554a72e390e777a2dba7a6bd50a5d08c70
tree: 332c951425bb4b8577920b11ca8788a4f0c2643c
  1. 1/
  2. current/
  3. Android.bp
  4. METADATA
  5. OWNERS
  6. SoongConfig.bp