[automerger skipped] Don't throw ANR if onTimeout flag is disabled. am: 078dbc16 -s ours

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

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



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