Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08"

* changes:
  Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121  -s ours
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/