tree b200fff2914576bdb3d59836b60e90f4adb0b12b
parent 37ca5b50e8c2bb53c519b6b429e6e4c704189c58
parent d2e50eb9689db76a0db3b709ae40bce18638ca2a
author Ray Essick <essick@google.com> 1523320584 -0700
committer android-build-merger <android-build-merger@google.com> 1523320584 -0700

[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
am: d2e50eb968

Change-Id: Ic6167b5ab7a083acc7f76defd0e197e9fd159330