Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-mr1-cts-dev am: 2a66c49f75  -s ours am: 2c9c01881d am: b80ba7d79a am: ee8f66048c  -s ours am: 44a6b01d12
am: b29320736b

Change-Id: I5b9a13ea7ae25d5c961d0f9760c6b3b807304010