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

[automerger skipped] Merge "Update default timeout value for network in transit state" into stage-aosp-master am: a58524fc -s ours am: 45977049 -s ours am: 1057290c -s ours

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

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



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