Merge SP1A.211205.008

Bug: 205056467
Merged-In: Ife94aecc90564f364e629ee1d30f9f6a0feda6e6
Change-Id: I5b1c9e89e67caa662707cdb609a7d4896f3a7e85
tree: 332c951425bb4b8577920b11ca8788a4f0c2643c
  1. 1/
  2. current/
  3. Android.bp
  4. METADATA
  5. OWNERS
  6. SoongConfig.bp