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

Change-Id: I4e886b7f03f8030f5e008e1ff9abc2254e35563d