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

Change-Id: Ifc4611aa18e1780c3272df0349371c33b8101609