Merge "Merge Android Pie into master" am: 3a6cc4e2ba am: e8d0533421 am: 427a5f423e
am: 4a65868f2b

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