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

Change-Id: I2095f2c54c50945d844cce771bdc4fbcf42875d3