Merge Android Pie into master am: d777b14338
am: 538f61b6c5

Change-Id: Ifeac114cf6af761fc5d3e4341bffd9481a952a85
tree: ee9e11b23ccc14799bb69ee46edf58c994598cab
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml