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

Bug: 126125118
Change-Id: Ic8d20056a1a08666df8e6cbe1c7b0d4aad2d7e8d
tree: 59b09c3ec7a34a33a547d64d7d3efe0ef041150d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags