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

Change-Id: If6bacdfd0aa41e6fa22dfc86c90607f5f4560230
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/