Merge "DO NOT MERGE: Make the tests permissive for N MR1 and MR2" into nougat-mr1-cts-dev