Merge "Create a single instance of CarrierPrivilegesTracker"