[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours
am: 81f274ebb2  -s ours

Change-Id: Ia8f2c0dc1dcaa42359b2c2211a6c8d6278647f45