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

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

Change-Id: I763c42250a2793647122c3c12423457bc2a140c5