Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev
* changes:
Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours
This commit is contained in: