Merge "Support phoneId when querying carrier packages." into mnc-dev