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

Change-Id: I9e4e516939407b1913cee168032d44b28ca766de


Trivial merge