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

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

Change-Id: I6f01985bf6c0b42913e245894f3d13bae804889e