DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I5f3aa9b079708476f94ea3df4eab98970961db7f
tree: cf065e31f21d3f78bf6d4563c76821558bac3375
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml