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

Bug: 126125118
Change-Id: Ib85ffb8d91732284cc95b9d4b795e9eb0416ceba
tree: d526598327697d7fc283e943e1e8df53b77e504b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS