[automerger skipped] Merge "Fixed two IMS data profiles sent to modem" into...

[automerger skipped] Merge "Fixed two IMS data profiles sent to modem" into tm-dev am: 3808d25d -s ours am: c99fbe75 -s ours am: 1d58882a -s ours

am skip reason: Merged-In I1858ad1c7a89cc8504f8cd7f7962528d6e103992 with SHA-1 2f4890f2 is already in history

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



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