Merge "[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" into oc-dev am: 68dc050239
am: 6edfe17ca2

Change-Id: I19b5b17dbd213dd08432c20c1a54b2c1c70a7eb1
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/