Merge "Add permission check for getDefaultCarrierServicePackageName" am: 4ec635ea11 am: 10b2243629 am: 6f15aad80d

Change-Id: Ic73ed63f1f3b1ab65c04c0b1c9998a665ab21a9e