tree 80ca5489f3519d96804a56addbea9ee72ff5ec88
parent 1e7206f1609c5cc91719d8d584d729582ae21f65
parent 8cda702a5a83f98cc3572141b5ddd25f50b8a498
author Ray Essick <essick@google.com> 1523322437 -0700
committer android-build-merger <android-build-merger@google.com> 1523322437 -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 am: 72b96b0354  -s ours am: b591008bc2  -s ours am: 8cda702a5a  -s ours
am: 8b83e5ce28  -s ours

Change-Id: I7f589a52ade3681f616e765c97462f5786def7e0