Merge "Merge Android Pie into master"
am: 72e1190e2d

Change-Id: I14fa31155027c873365ea0af743f00ab6e603648
tree: ef3e30fbb74489510baaf6c8e58139be6005ffa0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS