DO NOT MERGE: Merge Oreo MR1 into master am: f65cd6f6a0  -s ours
am: 12ec691984

Change-Id: I85b5f01da1e2ffe087090787e452cd73caf54aea
tree: 6367992681dfe95b532d32eae2285f77cf5df29f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags