Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."

This reverts commit b872941b01c651df631b4b4700f3493b2f517f7b.

Change-Id: Idcc5c7817ab405cec136884528238b51ef762273
diff --git a/src/java/com/android/internal/telephony/PhoneSubInfo.java b/src/java/com/android/internal/telephony/PhoneSubInfo.java
index 5b88cbf..91909a2 100755
--- a/src/java/com/android/internal/telephony/PhoneSubInfo.java
+++ b/src/java/com/android/internal/telephony/PhoneSubInfo.java
@@ -367,10 +367,10 @@
 
     private boolean checkReadPhoneState(String callingPackage, String message) {
         try {
-            mContext.enforceCallingPermission(
+            mContext.enforceCallingOrSelfPermission(
                     android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
 
-            // SKIP checking run-time OP_READ_PHONE_STATE since using PRIVILEGED
+            // SKIP checking run-time OP_READ_PHONE_STATE since self or using PRIVILEGED
             return true;
         } catch (SecurityException e) {
             mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 96b6393..ba5e037 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -208,10 +208,10 @@
      */
     private boolean canReadPhoneState(String callingPackage, String message) {
         try {
-            mContext.enforceCallingPermission(
+            mContext.enforceCallingOrSelfPermission(
                     android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
 
-            // SKIP checking run-time permission since using PRIVILEDGED permission
+            // SKIP checking run-time permission since self or using PRIVILEDGED permission
             return true;
         } catch (SecurityException e) {
             mContext.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,