Merge "[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"
am: 9a804df9ee  -s ours

Change-Id: I630a6c679fb815569c2612386ad5bbd0c7031389