DO NOT MERGE: Merge Oreo MR1 into master

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