OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds

Bug: 21726452
Bug: 21878243
Change-Id: I390386e28d8f948b8672a212ac413dfa61e54a15

telephony/java/android/telephony/TelephonyManager.java

@@ -2143,7 +2143,7 @@ public class TelephonyManager {
         try {
             ITelephony telephony = getITelephony();
             if (telephony != null)
-                return telephony.getMergedSubscriberIds();
+                return telephony.getMergedSubscriberIds(mContext.getOpPackageName());
         } catch (RemoteException ex) {
         } catch (NullPointerException ex) {
         }

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -795,7 +795,7 @@ interface ITelephony {
      */
     String getLine1AlphaTagForDisplay(int subId, String callingPackage);
 
-    String[] getMergedSubscriberIds();
+    String[] getMergedSubscriberIds(String callingPackage);
 
     /**
      * Override the operator branding for the current ICCID.