[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: 8ed2c51f -s ours am: 5ee81778 -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: I477e9dab699a099d0dd40d305f279fca3e3d56e5