[automerger skipped] Merge "Add timeout for ImsState callback" into 24D1-dev am: 4d71fe03a4 -s ours

am skip reason: Merged-In I2f74b2587b9a273cbc5c966a4bf76d4db23a43ac with SHA-1 1abe280e52 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/28381766

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