Merge Android Pie into master
am: 73438f5333

Change-Id: I529eefdd7d762221616006459130eaf7798f405b
tree: d08005efa6f5393feab6c1ce0401a14da655cb54
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags