Merge "Moving launcher state verification higher." into sc-v2-dev am: 6f20ec39dc

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

Change-Id: I982958a0f01da5f07786274f785ac7904f2d66c6