[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: 2a60c1ea48 -s ours
am: ababc876d2
Change-Id: I97d8f91a6cfdcb4433ce70c903a45976c1a8bdc1
This commit is contained in: