[automerger skipped] Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE am: e2c8de1127 am: 3d58b26ff4 -s ours am: 1fdf489d69 am: a6a83bcad7

Change-Id: I2c1caab4a9ed93790805cc0ae855e588efee6827
tree: 59af821cfb48ab3232cd59aebf38d9802758aad0
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk
  4. METADATA