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

[automerger skipped] Merge "Update default timeout value for network in transit state" am: 680acedf am: 5fb499bb -s ours am: bb206444 -s ours am: acf42caa -s ours am: bd1bb072 -s ours

am skip reason: Merged-In If07122184adc42f5ddf5627c56c4e24973442027 with SHA-1 3c6c0522 is already in history

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



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