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

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



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