[RESTRICT AUTOMERGE] Revert "Don't force +1 for resource resolution."

This reverts commit a79ccc5b1d15f33316145b9b98441a1afc828e0d.

Reason for revert: UpsideDownCake/34 is now REL

Ignore-AOSP-First: UpsideDownCake Finalization

Bug: 275409981
Test: build
Change-Id: Ie6fb138edd20f02246ff2d3924497b1369d762f5
Merged-In: Ie6fb138edd20f02246ff2d3924497b1369d762f5
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 7383e63..9f9c222 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -493,7 +493,7 @@
          * @hide
          */
         @TestApi
-        public static final int RESOURCES_SDK_INT = SDK_INT;
+        public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;
 
         /**
          * The current lowest supported value of app target SDK. Applications targeting