Merge "[Screenshot] Extend timeout on user interaction" into 24D1-dev am: 2731731d

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



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