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

Change-Id: Ie37952d805f4376fedf69355037fdb5e485f220a
tree: 3102b9b3fd07576905515991d394343f11e86fa4
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags