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

Change-Id: Ice9443c7c783c7d047a0cb43cf8a51344ee4d414


Trivial merge