[automerger skipped] Merge "Fix exempt IMS from single PDN arbitration" am:...

[automerger skipped] Merge "Fix exempt IMS from single PDN arbitration" am: 2b02b5c6 am: 78e081d7 am: ed64a48e am: 2e4b1e47 -s ours am: 0c0b6501 -s ours

am skip reason: Merged-In I36bf08fe78abb2038ca2bc2b0031aaf56b746b2b with SHA-1 12bcb69b is already in history

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



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