[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
Change-Id: I76249d018adb0f547a47dfcd18c3a161e028f4ee
This commit is contained in: