[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours
am: 14b3dd4079 -s ours
Change-Id: I5e5b9f0398fb34ba263bd5fbe9a4299bf0bd41f7
This commit is contained in: