Merge Android Pie into master am: bc0a323aa8
am: 35f061545d

Change-Id: Iba1604a995a8bdc98c123593672b94712b0c588f
tree: 425350d783f248ea11209938273ce0d214ffc07d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml