[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:09:11 +0000 (11:09 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Nov 2018 19:09:11 +0000 (11:09 -0800)
am: e31f01c1e2  -s ours

Change-Id: Iefca908d69c5bd402494b1d7a97adac5074a8f1d


Trivial merge