Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev