Merge "[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" into oc-mr1-dev am: f893a5ace2 -s ours
am: bff6860b2a
Change-Id: I749496c317a222957dd4c70d304e0f0d6fa249eb
This commit is contained in: