Merge "Fix ScreenshotShelfView gesture handling" into 24D1-dev am: 25c685dca9

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

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