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