Android 12.0.0 release 21
[automerger skipped] Mark ab/7061308 as merged in stage. am: cda9aae0e8 -s ours am: 9c124a91fc -s ours

am skip reason: Change-Id Ib22844f68373f63ed255bff680f8015aee25cb4c with SHA-1 b43a76598d is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a4886d18f9e256d6ab85b61d0dc2d954589e6d0
tree: 05d5904f0008fbc74a4e5f753acb49b9a64e7b0f
  1. PMC/
  2. sl4n/
  3. UID/
  4. Android.bp
  5. OWNERS
  6. PREUPLOAD.cfg