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

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

Change-Id: Ia4a119e1f4b0ae55fe451cd965de79c234547990