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

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

Change-Id: I45bb4d64f4e6c3ee6a8bd49ce4903a882d2aa4b2