Merge "Clean up IllegalStateException for page pairing" into sc-v2-dev am: 0c689ef773

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

Change-Id: I04c5afea5e58038823d207e36103e816f4040760