Merge changes from topic "am-d07fe6158f29422e98a40e093be6fb1d"

* changes:
  Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours am: 72b96b0354  -s ours am: b591008bc2  -s ours
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/