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

Change-Id: I0c2837dcf5546e5f04bf7f5f9014422944aa443a


Trivial merge