DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I0e2011081d3cefb198742761e7b98867a93129cd
tree: 43f30baaccfb5aab2a6aaa6159e7e951792e92e2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml