Merge "Waiting for Launcher to restart after enabling test provider" into sc-v2-dev am: 543f73a09d am: 1a4f7da58e

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

Change-Id: Ifd760c546c303ca00cd0edb1abbb127334ccee3c