DO NOT MERGE: Merge Oreo MR1 into master am: 1c91b7d5be  -s ours am: 312c478c10
am: 71f7453497  -s ours

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