[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ae91a6ad6f  -s ours

Change-Id: I8b3d556e7db65421f5a9d022428cecf541367e36