[automerger skipped] Merge "Move carrier privilege intent resolution to...

[automerger skipped] Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker." am: 24720118 am: 025e986c am: f0fb0755 -s ours

am skip reason: Merged-In Icdf82d070662eeac07fdaa3299163937a64fc563 with SHA-1 a99c48b0 is already in history

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

Change-Id: I066e6de22167cb5f26f0498f36c62aeb049378d8