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

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



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