tree 03469773cb3dcf9de1579375494751bb24de1a91
parent 27914625b113e23ea07f8e549127083091f82dcc
parent ac7531ccb489393fc403c33b74724ec1c5384138
author Ray Essick <essick@google.com> 1523317577 -0700
committer android-build-merger <android-build-merger@google.com> 1523317577 -0700

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

Change-Id: Ie4d139a1eb1c5fc6506bb79861ffe81fed7c0157