Merge "Update default timeout value for network in transit state" into...

Merge "Update default timeout value for network in transit state" into tm-d1-dev am: b5dbbafe am: 733b7583

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



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