Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker."