Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Ia9fec6dd06eedf57db3ea5b2b06e72b4dcd233f4
Change-Id: I2813bb3702eed7bd6eea17cf1472a51eec1cbe6e
tree: 6ace48e245836b349db1f128df56253566d49418
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk
  6. METADATA