[automerger skipped] Merge "Clean up UiccPort/Profile on carrier privileges...

[automerger skipped] Merge "Clean up UiccPort/Profile on carrier privileges rule load registration" am: 9df7f40a am: fc0c5ca9 am: 1d1049a5 -s ours am: c4076c61 -s ours

am skip reason: Merged-In Idb3cbe66b3fe67548b1507346e1e38140e04bbf8 with SHA-1 dc3f5f2f is already in history

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

Change-Id: Ife5990777c46b7727186551187652c61ce107ffb