[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-plus-aosp am: cc8f8941 -s ours am: b59c85c9 -s ours am: 6fa59282 -s ours

am skip reason: Merged-In If07122184adc42f5ddf5627c56c4e24973442027 with SHA-1 5c2acf80 is already in history

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



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