[automerger skipped] Merge "Update PIM to adapt to mutable IccLogicalChannelRequest" am: 7bac9cf275 am: 29b7e1c0aa am: 1c1e116b50 -s ours am: 2bcfe190d6 -s ours

am skip reason: Merged-In Iff32eacb3577393709b12b0789c21e6270fbaf8a with SHA-1 a178270dfc is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2037286

Change-Id: Icc6145ab5b091b0c8ce0aa4e46e5a6168f081d68