Merge "Make NETWORK_RELEASE_TIMEOUT_MILLIS configurable by carrier" am: 99f5d0a07d am: fd0e7112bc

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

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