[automerger skipped] Merge "Revert^2 "Re-adding logic to hide launcher shortcuts when shade is open"" into 24D1-dev am: b71024d084 -s ours

am skip reason: Merged-In If9e0aebba47a7778a7f6a7c32c83fedb281d9603 with SHA-1 b4d4604a9b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26516309

Change-Id: I3047fdda9365cf5733532a3333ba32cd0357a6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>