[automerger skipped] Merge "Update NetworkTypeController with new...

[automerger skipped] Merge "Update NetworkTypeController with new CarrierConfigManager APIs" into udc-dev am: 63a73dc4 -s ours

am skip reason: Merged-In I10150b0b55c64299ab130dc6c6027d267db4c003 with SHA-1 3d339b92 is already in history

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



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