[automerger skipped] Merge "Supported single PDN arbitration" am: e7fa69ec...

[automerger skipped] Merge "Supported single PDN arbitration" am: e7fa69ec am: fbd5bdb1 am: 2bcfe4e0 -s ours am: 0c423436 -s ours am: c39ae701 -s ours

am skip reason: Merged-In Id5e889e87efde322908b33c73b7b1c8137824138 with SHA-1 44d6e663 is already in history

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

Change-Id: I5ea24cd28c80df56eb65ad933ea3f95a8bb08924