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

Bug: 126125118
Change-Id: I7835984f0f23441f411db4208670c5cf879e5043
tree: 3efeffb4c7636ced0350e0981a557fc306036f4a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS