[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours skipped: 2af33bcc3e skipped: e9ec3eb83b skipped: 49581046e4 skipped: 4986062ed3 skipped: 9b1b7bc603

Change-Id: I3863fb6ce4b6d540437d2afee718d390225928a8