Merge "Revert "Fix issue with Shell listeners being unbound if SysUI is restarted"" into sc-v2-dev am: cbafa6803b

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

Change-Id: I898cd74ea9ea335c0a4e2546f79081f52183c229