Merge "Merge Android Pie into master"
am: e8096bd401

Change-Id: I3b2cb98e986b3b2e37fe5aefb698a19b48eb7c49
tree: 7138808c3bc4125da3e9f77f8005ff42974c2d1e
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml