Merge Android Pie into master am: 73438f5333 am: 6ee9224a22
am: 0395be492c

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