Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 05c6fc38a1  -s ours am: 9e52ce0be7 am: b05c56a15e
am: 70b23f0a3a

Change-Id: I8c6ec52d3a9dd52cd17b0f4b14217365249290e1