tree 75a10edf72cfba28d92b04107c06e95e30e16732
parent bbc39aba5bbe345dcb9b69fb1c6b440b7ae878b5
parent 31786e4612e0622e73063208b44d3008ee7c4f52
author Ray Essick <essick@google.com> 1523315557 -0700
committer android-build-merger <android-build-merger@google.com> 1523315557 -0700

[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ac5b691121  -s ours

Change-Id: I68bd2d8587558b601681d0a46b22c6f30cb9fa62