Fix incorrect tags for device capabilities

Bug: 172396319
Test: Successful download with sample Telus profile
Change-Id: I599dc2f1a0e69a8c6392df9c860a1270fc4ca3c0
diff --git a/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java b/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java
index 0b56273..7ec5e60 100644
--- a/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java
+++ b/src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java
@@ -1063,13 +1063,13 @@
                 devCapBuilder.addChildAsBytes(Tags.TAG_CTX_7, versionBytes);
                 break;
             case DEV_CAP_NREPC:
-                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);
+                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_8, versionBytes);
                 break;
             case DEV_CAP_NR5GC:
-                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);
+                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);
                 break;
             case DEV_CAP_EUTRAN5GC:
-                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_11, versionBytes);
+                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);
                 break;
             default:
                 loge("Invalid device capability name: " + devCap);
diff --git a/src/java/com/android/internal/telephony/uicc/euicc/Tags.java b/src/java/com/android/internal/telephony/uicc/euicc/Tags.java
index 26df42b..1eab199 100644
--- a/src/java/com/android/internal/telephony/uicc/euicc/Tags.java
+++ b/src/java/com/android/internal/telephony/uicc/euicc/Tags.java
@@ -57,7 +57,6 @@
     static final int TAG_CTX_8 = 0x88;
     static final int TAG_CTX_9 = 0x89;
     static final int TAG_CTX_10 = 0x8A;
-    static final int TAG_CTX_11 = 0x8B;
 
     // Context tags for constructed (compound) types
     static final int TAG_CTX_COMP_0 = 0xA0;