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

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

Change-Id: Ieea160280857575469cde9da84e110b0830e9319