Use separate switch ops for runtime permissions

If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.

Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
(cherry picked from commit 99e4d51584)

core/java/android/app/AppOpsManager.java

@@ -403,8 +403,8 @@ public class AppOpsManager {
             OP_WRITE_SMS,
             OP_RECEIVE_SMS,
             OP_RECEIVE_SMS,
-            OP_RECEIVE_SMS,
-            OP_RECEIVE_SMS,
+            OP_RECEIVE_MMS,
+            OP_RECEIVE_WAP_PUSH,
             OP_SEND_SMS,
             OP_READ_SMS,
             OP_WRITE_SMS,