Merge Android Pie into master
am: 5d43cb2328

Change-Id: I1a26abdf16c5c8cab9a7fcd6c48ec32d3bb39988
tree: 7428d162d33652aef836607c855d18330e41a7a4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml