[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

Change-Id: Icdb4c482157fdff88c35ae2a92bc8ca92481b592