Merge "Use displayId to determine CHANGE_ACTIVE_SCREEN" into sc-v2-dev am: 5d2309285c am: eac5ca8736

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

Change-Id: I9162ab87433685863179ba361805f5233d0fb41b