[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: d0ff8fbabb -s ours
am: 52211eb32f -s ours Change-Id: I1832558dfd5d2a2b4f716a4d9d7db45c9ba25098
This commit is contained in: