[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

Change-Id: Ib90a3db2bb775bd0ba9024fdafd7f7b498c808f3