Merge "[DO NOT MERGE] Increase timeout to wait/process user switch" into oreo-mr1-cts-dev