Merge Android Pie into master am: 73438f5333 am: 6ee9224a22
am: 0fcc6607a0

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