Merge "Revert "Fix permission check for get/setSmscAddress.""