Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Replace core-junit with junit" am: 2b483ecb8b am: 6423c63a15 am: b73f9e1871
am: e79665e365

Change-Id: I6baab0fb7f8918214d2564297fe931769396d9bb