Merge "Make getDefaultCarrierServicePackageName for Mainline"