Merge "Make getDefaultCarrierServicePackageName for Mainline"
am: 071d78b1ef

Change-Id: I97c5ecfaf01856e0983f0805e357211f75dfdf06