[automerger skipped] DO NOT MERGE: Make the tests permissive for Lollipop MR1 am...
authorrie kanazawa <rie.kanazawa.sd@kyocera.jp>
Wed, 21 Nov 2018 19:29:45 +0000 (11:29 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Nov 2018 19:29:45 +0000 (11:29 -0800)
am: 6bb25b4e2a  -s ours

Change-Id: I276fc018922f87d1dce48fd405b65c43294554cb


Trivial merge