Merge "Merge Android Pie into master" am: fdf6cca64e
am: 0e4aabf7fc

Change-Id: I816c6bb2f010d3811e19b3b1491e5f7a6d91a273
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml