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

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

Change-Id: I8d760ec6d739d7374b3c4255a515760a4feec867