Merge "Waiting for Launcher to settle after enabling test provider" into sc-v2-dev am: 50f928c388

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

Change-Id: Ifc8e143cf56a9e0e8bbd8308a7d1453c67a6db2f