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

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

Change-Id: I4ed361ecfd4d96c2b0a6e48c00e8d0282a7c3f1b