Merge "Make getDefaultCarrierServicePackageName for Mainline" am: 071d78b1ef am: 58fd0fd58d

Change-Id: I9150a6d9c2252ae3d7931c0a2bf13b1262bcac4b