Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev

* changes:
  Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours
tree: d500dfe3f2212b65980908fff277cafcebb733ea
  1. tests/