[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: 60b76521 -s ours am: 33d8226a -s ours

am skip reason: Merged-In If07122184adc42f5ddf5627c56c4e24973442027 with SHA-1 55e4f1dd is already in history

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



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