[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa
Change-Id: I624e926842a0e35b34e38e19e109d62653cb1e2a
This commit is contained in: