[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 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: I836a751f8249f13ebb0df0544931c8adcc9ac889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>