Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 841f1b3694  -s ours am: 4bc1a01bc1
am: 32d3869ae3  -s ours

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