tree 50d4f626540de64fa8ed005c9741932aa373241a
parent a941d3eaeb34075750a92eff2d2a66b0bad5e449
parent 6571bb5854763a546a59f5b707e972221a64ef40
author wwx234259 <yuanshuo1@huawei.com> 1533281233 -0700
committer android-build-merger <android-build-merger@google.com> 1533281233 -0700

[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