Merge "Merge "Merge "Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-cts-dev am: 4b5d593188  -s ours" into nougat-mr1-cts-dev am: 840d9009e1  -s ours" into oreo-cts-dev am: dbe7ba5322  -s ours"