DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I34d1ffa271e7aa97f5e3e666c457932108e5c3e8
tree: a175d19a67ecc3126636a1af0fb6efef97687e32
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags