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

Change-Id: I6537bdb9fc00719dc1a45b71a90b1c6ceeb781fb