[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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e

Change-Id: I5c8a8aa2a76cf62357d437385d907a4df9398a95