Merge "Add timeout to AbstractLauncherUiTest.getOnUiThread" into sc-v2-dev am: 953641e28d am: 1bad3382fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16321879

Change-Id: Iee12654f4221a0afef718057d9569d4ac2527538