Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-cts-dev am: 069ef3f824  -s ours am: 096da7c3b3 am: 4009e95ca1 am: 5141373e8a am: 843f9e74c7 am: 2deaf10d49  -s ours am: ba175c74cb
am: b83010a3a8

Change-Id: If42f328d2c27d424c980dc81a365111e7a84c0f3