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: I8b7c1bb955542859dd02aca5117b7b8439a819ba