DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ibdb1949ade658c1207f3e5e6587a4fc35e386a80
tree: 42825af1a22e6c1c8fa91b2a3938cf63c5c29a43
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE