Merge "(Backport) No need to use PermissionChecker when checking own permission"

package com.android.internal.telephony;

import static android.content.PermissionChecker.PERMISSION_GRANTED;

import static android.provider.Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG;

import android.Manifest;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.content.PermissionChecker;

import android.content.pm.PackageManager;

import android.location.Location;

import android.location.LocationListener;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Process;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Telephony;

        }

        private boolean hasPermission(String permission) {

            return PermissionChecker.checkCallingOrSelfPermissionForDataDelivery(mContext,

                    permission) == PERMISSION_GRANTED;

        return mContext.checkPermission(permission, Process.myPid(), Process.myUid())

                    == PackageManager.PERMISSION_GRANTED;

        }

        private final LocationListener mLocationListener = new LocationListener() {