[automerger skipped] Merge "DO NOT MERGE: Make the tests permissive for OMR1 Fix a timing bug, make sure to wait for the assistant to enable" into oreo-mr1-cts-dev
am: 6571bb5854  -s ours

Change-Id: I0a43659eb505640cba5736d4db15e5937bd9b213