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

Change-Id: Id7d5a669fb0c542b6ab530e6c1930318c7c84ca2