[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 81c482bdd4
am: a208a33079
Change-Id: I23ce9a632344d83d34373f72082a9cfed99568bc
This commit is contained in: