Merge "Merge Android Pie into master" am: e8096bd401
am: 59df3e22e6

Change-Id: I2b8a0e6e90c85fe5fd1bdb3466719ff692a097e1
tree: 94111e92314393e40282e6919df9e6a33d991439
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml