Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev

* 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
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/