Merge "Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: ee95bd5676  -s ours"
am: 17aec3945a  -s ours

Change-Id: I7385a70863fe5b20ec9ee8d2fd5750e42a885d6d