Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8"

* changes:
  Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours am: f3d4af802c  -s ours
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/