[automerger skipped] Merge "Add default IMS DP after sim loaded" am:...

[automerger skipped] Merge "Add default IMS DP after sim loaded" am: 994930e9 am: 1913560f am: b9faf884 am: 20fddb46 am: 5ba3ce22 am: c74948b1 -s ours

am skip reason: Merged-In I7003732443ab0faeaaa5d8ffb0f929bff9646f90 with SHA-1 6296014c is already in history

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



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