[automerger skipped] Merge "DO NOT MERGE Fix a timing bug, make sure to wait for home before asserting state" into oreo-mr1-cts-dev
am: 5d4b0b6b52  -s ours

Change-Id: Idf8c97e8964bf2d88690173f6f76dab7c56a3569