Merge "Clear up CarrierPrivilegesListener APIs"