Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Iad685d7a9eeef2c6bb4dbb055410b345e1295ceb
tree: 31410771c98825bc1577deab0e160b868ac078ad
  1. res/
  2. Android.bp
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. OWNERS