[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
am: bafd18446f -s ours
Change-Id: Ib90a3db2bb775bd0ba9024fdafd7f7b498c808f3
This commit is contained in: