Merge "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" into oreo-cts-dev