Merge "[automerger skipped] Merge "DO NOT MERGE: Increase timeout to wait/process user switch" into oreo-cts-dev am: 246b1e1d5d  -s ours" into oreo-mr1-cts-dev
am: 17d0bf17d8  -s ours

Change-Id: I48e2f0db9df42d9a5e579b2ae1185d6bc08cfbfa