DO NOT MERGE: Merge Oreo MR1 into master am: b2281c1334  -s ours am: 86d9198044
am: 3e777347ed  -s ours

Change-Id: I0b4450066356c9d64fd4e1b02cb8b85706a4d334
tree: 5af6995cf939f5bdd36879afa56d32804e290f32
  1. Android.mk
  2. NOTICE.txt
  3. android/
  4. androidx/
  5. com/
  6. source.properties