Merge Android Pie into master am: 52f5ff0f14
am: 888206adfa

Change-Id: I880fd2b1887cc48ccd3dd6cbf718fb2e2050e097
tree: 2b191ac4db1951864f4aa18343a9d58c5e8eb0fc
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg