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

Change-Id: I617a29323071029df603b5b0365401b50331bb81