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

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



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