Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 206e4673c3  -s ours am: 7a1e3d84ff
am: 7a3c337ed4

Change-Id: Ia1f0e8ff17a52bf342ad475928ac45379ac3248f