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

Change-Id: Ice009f7f6db7acbfc333acc5abad9b5e0f173ec5


Trivial merge