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: 968f6fc9 am: 864b3e67

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



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