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

Bug: 126125118
Change-Id: I31417836ae91480839043d1ecc639ca06cd6de4e
tree: 83579290c12daedf586c30539c218042338c4a07
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml