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
am: efd6eebd07

Change-Id: I37a24ae62d8a0fc7dcc07b3e98395f5400af5515