Merge "Fixed two IMS data profiles sent to modem" into tm-d1-dev am: b0837cf7

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



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