Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 20aacbf012

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21524504

Change-Id: Ia8b97c8ac87c4ef7f658c376e27a2b4ebfb09855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/api/current.txt

@@ -30978,7 +30978,6 @@ package android.os {
     field public static final int S = 31; // 0x1f
     field public static final int S_V2 = 32; // 0x20
     field public static final int TIRAMISU = 33; // 0x21
-    field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

@@ -1167,11 +1167,6 @@ public class Build {
          * Tiramisu.
          */
         public static final int TIRAMISU = 33;
-
-        /**
-         * Upside Down Cake.
-         */
-        public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */

tools/aapt2/SdkConstants.cpp

@@ -27,7 +27,7 @@ namespace aapt {
 
 static ApiVersion sDevelopmentSdkLevel = 10000;
 static const auto sDevelopmentSdkCodeNames =
-    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});
+    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"});
 
 static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
     {0x021c, 1},