[automerger skipped] Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable...

[automerger skipped] Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable by carrier" am: 99f5d0a0 am: fd0e7112 am: 49f93242 -s ours

am skip reason: Merged-In If96083a8491cacb9fa77131213d6408cfe2d2458 with SHA-1 a88f6d4d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2334667



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