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

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