Merge "Support test override carrier privilege in CarrierPrivilegeTracker"