tree e3c17fcbbce93239c7a396489a0984956f82c05e
parent 46b33d45f7a06ef900349a76329fd77c8ef34d6b
parent ac7531ccb489393fc403c33b74724ec1c5384138
author Ray Essick <essick@google.com> 1523316785 -0700
committer android-build-merger <android-build-merger@google.com> 1523316785 -0700

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

Change-Id: I9d60b68be04ed4f32a782ba09f406b2953f4938b