[automerger skipped] Merge "Update default timeout value for network in...

[automerger skipped] Merge "Update default timeout value for network in transit state" into tm-dev am: 0053d576 -s ours am: 66a5931e -s ours am: 0ca1df61 -s ours am: 88d9fb3a -s ours

am skip reason: skipped by user linggm

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



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