Merge "Timeout if carrier service does not respond." into sc-dev am:...

Merge "Timeout if carrier service does not respond." into sc-dev am: ae91ab32 am: efc99cd8 am: 51fa3753

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14457483

Change-Id: I973b303cd4a615a345af0df9f7db33f4a69d6132