Merge "Waiting for broadcasts idle in TaplInstrumentation constructor" into sc-v2-dev am: 0e8f7098b4 am: ea8fa012e5

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

Change-Id: I3ca0d6c3c9d4134195e1292ab3e2b1a0eb61ea72