tree f3f0cc4dfc1fd0c32aee204964900997d22853ac
parent 34ef78f44f3fa6ef1b5813d4fb7896f0f90ccb4f
parent 1c7d94f2f759a0421456cd516051d481133e3e36
author Ray Essick <essick@google.com> 1523312843 -0700
committer android-build-merger <android-build-merger@google.com> 1523312843 -0700

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

Change-Id: Id298dfba4969b5b1555a557fee67bb0e0a91ea7c