tree 3cfc405f22847ea44743da0c9a343404ecde7883
parent 02cf01f51c034ff9ded26ac3436fc09a92cf82df
parent bafd18446f8cf888beb8779a1e54881eeba0f81f
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: afb3e84599  -s ours
am: bafd18446f  -s ours

Change-Id: Ib90a3db2bb775bd0ba9024fdafd7f7b498c808f3