Merge "Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 9c1aeadb94  -s ours" into oreo-mr1-cts-dev
am: 7e83c1fba5  -s ours

Change-Id: I8172f1365be8f64113f5807694978c4bd6a26c5e