tree abc5f4e655b70be4f6a69fde678c6bd24d644518
parent 5e8cf6e9cd481300797743a54f5b09a5b53ba34a
parent 2c2b61d04b11c5a2a6100700273d9fcd5156d64b
author Ray Essick <essick@google.com> 1523318738 -0700
committer android-build-merger <android-build-merger@google.com> 1523318738 -0700

[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