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

Change-Id: Ieb354df86d75ab4cbbf657d2c73bf296dc98084c


Trivial merge