Merge "DO NOT MERGE: Make the tests permissive for N MR1 and MR2" into nougat-mr1-cts-dev am: 418dc67321  -s ours
am: b03f0144ca

Change-Id: I66ea3386f597c1b48b52788066d841a19fa6ceb2