Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Contacts: Fix NPE in QuickContactActivity in monkey test"
am: 6529af3c9c

Change-Id: Ie128ecba2395fb881b1fa437581dfe104311e0a8