tree f1590eb6b4e25feb86887484cbf2ee01072b4a9d
parent 0cb863b92769cd1e99d1468d5be0725c91ddbe91
parent 40ad986eab60f3eb73039debaa24912028c699f0
author Michael K. Sanders <mks@google.com> 1545180843 -0800
committer android-build-merger <android-build-merger@google.com> 1545180843 -0800

[automerger skipped] Fixes VTS test failures. am: 2a0101203f am: aac609d9bc
am: 40ad986eab  -s ours

Change-Id: I42a6ea4f4b1d7c30d1fd2b435ef626ef42c06227