tree 80ca5489f3519d96804a56addbea9ee72ff5ec88
parent a0bc089548c3c97e00e8e356796ba3d33a16e6c8
parent 14b3dd4079c5300c7b77e73d1760271b3d353b0d
author Ray Essick <essick@google.com> 1523317405 -0700
committer android-build-merger <android-build-merger@google.com> 1523317405 -0700

[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours am: f3d4af802c  -s ours
am: 14b3dd4079  -s ours

Change-Id: I5e5b9f0398fb34ba263bd5fbe9a4299bf0bd41f7