Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/