Merge Android Pie into master
am: 7b69f347d6

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