Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker." am: 2e20da3623

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

Change-Id: I766237a0140eb664e0ee11ed49b2f73d6ebed60b