[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am: e859193ff0 -s ours
am skip reason: subject contains skip directive

Change-Id: I2bb98547ff5b2cce52970968749b8d9bd1ec4563
tree: ce728a56e46ff1db11aa38ef1496d82122ff7fa3
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk