Merge "Improved UiBot.switchAppsUsingRecents() so it doesn't fail if Recents takes too long to show." into oreo-mr1-cts-dev am: 3fb0f4d333 am: 8ae260bc74
am: a31749f80f  -s ours

Change-Id: Id5acf37afa78043a0bf58215dddff66fcfb85528