[automerger skipped] DO NOT MERGE: Make the tests permissive for Lollipop MR1 am: 7d112535f4  -s ours am: 67fddf713c  -s ours am: e31f01c1e2  -s ours
am: 2510d0d22d  -s ours

Change-Id: Ieb354df86d75ab4cbbf657d2c73bf296dc98084c