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

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

Change-Id: If34f3ef5902eca2710f5cd49097d185c4d1010b3