* changes: Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
6977a333a5