Merge "Fix CastError on SecondaryDisplay" into sc-dev am: c632e36dc0

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

Change-Id: If394acff23604c7d0bf923a15a8faf044c36cb10