Merge "Force update override network type before timer" into udc-dev am: 3a84cc40 am: 92a51a24

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



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