Merge "Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-cts-dev am: 069ef3f824  -s ours" into nougat-mr1-cts-dev am: 05e95a9f94  -s ours am: 86c5b3a66c am: e1372634f1
am: 5833e8a4dd  -s ours

Change-Id: I4d4e79ffcc692a4e5abefa34041c55ec7d6904f2