Android 12.1.0 release 24
[automerger skipped] Mark ab/7061308 as merged in stage. am: f79356d1c9 -s ours am: 872ec7ecd3 -s ours

am skip reason: Change-Id I82289538a93fd6f749aa6825a5ce93d989e21d1d with SHA-1 ef55f31eef is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa53a531032e96e345fc2f0a2526d5497188872
tree: 1a7fa7a4d0b8401cb0234b6503cb710ac7073b1e
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk
  4. METADATA