Merge Android Pie into master

Bug: 112104996
Change-Id: Id90a990ad0c6b8fcce63c4c374ee7296cd3f574a
tree: f8823f36a2a8b47cfb4606f6cd34be15a9675467
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags