[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
Change-Id: I6535fac037e64685d3497646aa38bd8370403a72
This commit is contained in: