[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: dc7f7f7d73  -s ours am: 2c2b61d04b  -s ours skipped: 4ff7b023d7 skipped: 21dd8f89b8 skipped: dd55dd4cb6
am: 180d1d1eb1

Change-Id: I9bae103b065f64519e4cc9a844b47af36e49c0a6