[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 am: 72b96b0354 -s ours
am: b591008bc2 -s ours
Change-Id: Id2cd89dae283270d5a88a7c42b0f2cbdc311e9a6
This commit is contained in: