Merge changes from topic "am-16b0b195e940437c988164c18e28c9c8"

* changes:
  Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours am: 3ace7af527  -s ours
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/