DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I1ec136a6b654655a0e78c3ee1d3c7f5557999652
tree: 91032c0ea1ecf5e6911c5145b5116075b8e75ade
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml