Merge "Merge Android Pie into master"
am: 3a6cc4e2ba

Change-Id: I9da4ae92e670227544472596b017ac2baa83178c
tree: 72b5e02633c3fc4f70c4c682dc85a033fbf4a571
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags