[automerger skipped] Merge "Don't throw ANR if onTimeout flag is disabled." into 24D1-dev am: e31f21256d -s ours

am skip reason: Merged-In I6601fd1af8cd617bae5e3c3deb1019d65c5e3908 with SHA-1 21492dcd91 is already in history

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

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