DO NOT MERGE: Merge Oreo MR1 into master am: 77b17c8c8c  -s ours
am: e0f80a1685

Change-Id: If7765df1445e1591b66179fac3a83c5a15352de9
tree: 83c66db45a3934631fb90439e6a65b04056d8c73
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml