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

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

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



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