diff --git a/api/current.txt b/api/current.txt
index 3f8bee9230a6e..467aa32a7d671 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -290,7 +290,7 @@ package android {
     field public static final int allowBackup = 16843392; // 0x1010280
     field public static final int allowClearUserData = 16842757; // 0x1010005
     field public static final int allowEmbedded = 16843765; // 0x10103f5
-    field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613
+    field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612
     field public static final int allowParallelSyncs = 16843570; // 0x1010332
     field public static final int allowSingleTap = 16843353; // 0x1010259
     field public static final int allowTaskReparenting = 16843268; // 0x1010204
@@ -326,7 +326,7 @@ package android {
     field public static final int autoLink = 16842928; // 0x10100b0
     field public static final int autoMirrored = 16843754; // 0x10103ea
     field public static final int autoRemoveFromRecents = 16843847; // 0x1010447
-    field public static final int autoRevokePermissions = 16844309; // 0x1010615
+    field public static final int autoRevokePermissions = 16844307; // 0x1010613
     field public static final int autoSizeMaxTextSize = 16844102; // 0x1010546
     field public static final int autoSizeMinTextSize = 16844088; // 0x1010538
     field public static final int autoSizePresetSizes = 16844087; // 0x1010537
@@ -391,7 +391,7 @@ package android {
     field public static final int canRequestFingerprintGestures = 16844109; // 0x101054d
     field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
     field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
-    field public static final int canTakeScreenshot = 16844304; // 0x1010610
+    field public static final int canTakeScreenshot = 16844303; // 0x101060f
     field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230
     field public static final int cantSaveState = 16844142; // 0x101056e
     field @Deprecated public static final int capitalize = 16843113; // 0x1010169
@@ -486,7 +486,7 @@ package android {
     field public static final int countDown = 16844059; // 0x101051b
     field public static final int country = 16843962; // 0x10104ba
     field public static final int cropToPadding = 16843043; // 0x1010123
-    field public static final int crossProfile = 16844303; // 0x101060f
+    field public static final int crossProfile = 16844302; // 0x101060e
     field public static final int cursorVisible = 16843090; // 0x1010152
     field public static final int customNavigationLayout = 16843474; // 0x10102d2
     field public static final int customTokens = 16843579; // 0x101033b
@@ -708,7 +708,7 @@ package android {
     field public static final int gravity = 16842927; // 0x10100af
     field public static final int gridViewStyle = 16842865; // 0x1010071
     field public static final int groupIndicator = 16843019; // 0x101010b
-    field public static final int gwpAsanMode = 16844312; // 0x1010618
+    field public static final int gwpAsanMode = 16844310; // 0x1010616
     field public static final int hand_hour = 16843011; // 0x1010103
     field public static final int hand_minute = 16843012; // 0x1010104
     field public static final int handle = 16843354; // 0x101025a
@@ -953,7 +953,7 @@ package android {
     field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad
     field public static final int mediaRouteTypes = 16843694; // 0x10103ae
     field public static final int menuCategory = 16843230; // 0x10101de
-    field public static final int mimeGroup = 16844311; // 0x1010617
+    field public static final int mimeGroup = 16844309; // 0x1010615
     field public static final int mimeType = 16842790; // 0x1010026
     field public static final int min = 16844089; // 0x1010539
     field public static final int minAspectRatio = 16844187; // 0x101059b
@@ -1082,7 +1082,7 @@ package android {
     field public static final int preferenceScreenStyle = 16842891; // 0x101008b
     field public static final int preferenceStyle = 16842894; // 0x101008e
     field public static final int presentationTheme = 16843712; // 0x10103c0
-    field public static final int preserveLegacyExternalStorage = 16844310; // 0x1010616
+    field public static final int preserveLegacyExternalStorage = 16844308; // 0x1010614
     field public static final int previewImage = 16843482; // 0x10102da
     field public static final int primaryContentAlpha = 16844114; // 0x1010552
     field public static final int priority = 16842780; // 0x101001c
@@ -1345,7 +1345,7 @@ package android {
     field public static final int summaryOff = 16843248; // 0x10101f0
     field public static final int summaryOn = 16843247; // 0x10101ef
     field public static final int supportsAssist = 16844016; // 0x10104f0
-    field public static final int supportsInlineSuggestions = 16844302; // 0x101060e
+    field public static final int supportsInlineSuggestions = 16844301; // 0x101060d
     field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
     field public static final int supportsLocalInteraction = 16844047; // 0x101050f
     field public static final int supportsMultipleDisplays = 16844182; // 0x1010596
@@ -35870,7 +35870,7 @@ package android.os {
     field public static final int O_MR1 = 27; // 0x1b
     field public static final int P = 28; // 0x1c
     field public static final int Q = 29; // 0x1d
-    field public static final int R = 10000; // 0x2710
+    field public static final int R = 30; // 0x1e
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/api/removed.txt b/api/removed.txt
index cddccb3e68bb8..e7e96776ac0dc 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -1,12 +1,4 @@
 // Signature format: 2.0
-package android {
-
-  public static final class R.attr {
-    field public static final int featureId = 16844301; // 0x101060d
-  }
-
-}
-
 package android.app {
 
   public class ActivityManager {
diff --git a/api/system-current.txt b/api/system-current.txt
index c5d319cc1d000..f07ebaf19cb69 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -256,10 +256,10 @@ package android {
   public static final class R.attr {
     field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600
     field public static final int isVrOnly = 16844152; // 0x1010578
-    field public static final int minExtensionVersion = 16844306; // 0x1010612
+    field public static final int minExtensionVersion = 16844305; // 0x1010611
     field public static final int requiredSystemPropertyName = 16844133; // 0x1010565
     field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566
-    field public static final int sdkVersion = 16844305; // 0x1010611
+    field public static final int sdkVersion = 16844304; // 0x1010610
     field public static final int supportsAmbientMode = 16844173; // 0x101058d
     field public static final int userRestriction = 16844164; // 0x1010584
   }
@@ -291,8 +291,8 @@ package android {
   public static final class R.string {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultBrowser = 17039394; // 0x1040022
-    field public static final int config_defaultCallRedirection = 17039400; // 0x1040028
-    field public static final int config_defaultCallScreening = 17039401; // 0x1040029
+    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025
+    field public static final int config_defaultCallScreening = 17039398; // 0x1040026
     field public static final int config_defaultDialer = 17039395; // 0x1040023
     field public static final int config_defaultSms = 17039396; // 0x1040024
     field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
@@ -301,7 +301,7 @@ package android {
     field public static final int config_helpIntentNameKey = 17039390; // 0x104001e
     field public static final int config_helpPackageNameKey = 17039387; // 0x104001b
     field public static final int config_helpPackageNameValue = 17039388; // 0x104001c
-    field public static final int config_systemGallery = 17039402; // 0x104002a
+    field public static final int config_systemGallery = 17039399; // 0x1040027
   }
 
   public static final class R.style {
diff --git a/api/test-current.txt b/api/test-current.txt
index 44fb63017ace8..1e69d424a8b0f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -38,7 +38,7 @@ package android {
   public static final class R.string {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultDialer = 17039395; // 0x1040023
-    field public static final int config_systemGallery = 17039402; // 0x104002a
+    field public static final int config_systemGallery = 17039399; // 0x1040027
   }
 
 }
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 70b2db70a9e89..ef2a8a122e956 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1005,7 +1005,7 @@ public class Build {
         /**
          * R.
          */
-        public static final int R = CUR_DEVELOPMENT;
+        public static final int R = 30;
     }
 
     /** The type of build, like "user" or "eng". */
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index fb887c338fc4f..2869021a8a72d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2979,9 +2979,51 @@
     <!-- @hide @SystemApi -->
     <public type="color" name="system_notification_accent_color" id="0x0106001c" />
 
+    <!-- ===============================================================
+     Resources added in version R of the platform
+     =============================================================== -->
+    <eat-comment />
+
+    <public type="attr" name="importantForContentCapture" id="0x01010607" />
+    <public type="attr" name="forceQueryable" id="0x01010608"/>
+    <public type="attr" name="resourcesMap" id="0x01010609"/>
+    <public type="attr" name="animatedImageDrawable" id="0x0101060a"/>
+    <public type="attr" name="htmlDescription" id="0x0101060b"/>
+    <public type="attr" name="preferMinimalPostProcessing" id="0x0101060c"/>
+    <public type="attr" name="supportsInlineSuggestions" id="0x0101060d"/>
+    <public type="attr" name="crossProfile" id="0x0101060e"/>
+    <public type="attr" name="canTakeScreenshot" id="0x0101060f"/>
+    <!-- @hide @SystemApi -->
+    <public type="attr" name="sdkVersion" id="0x01010610" />
+    <!-- @hide @SystemApi -->
+    <public type="attr" name="minExtensionVersion" id="0x01010611" />
+    <public type="attr" name="allowNativeHeapPointerTagging" id="0x01010612" />
+    <public type="attr" name="autoRevokePermissions" id="0x01010613" />
+    <public type="attr" name="preserveLegacyExternalStorage" id="0x01010614" />
+    <public type="attr" name="mimeGroup" id="0x01010615" />
+    <public type="attr" name="gwpAsanMode" id="0x01010616" />
+
+    <!-- @hide @SystemApi -->
+    <public type="string" name="config_defaultCallRedirection" id="0x01040025" />
+    <!-- @hide @SystemApi -->
+    <public type="string" name="config_defaultCallScreening" id="0x01040026" />
+    <!-- @hide @SystemApi @TestApi -->
+    <public type="string" name="config_systemGallery" id="0x01040027" />
+
+    <public type="id" name="accessibilityActionPressAndHold" id="0x0102004a" />
+    <public type="id" name="accessibilitySystemActionBack" id="0x0102004b" />
+    <public type="id" name="accessibilitySystemActionHome" id="0x0102004c" />
+    <public type="id" name="accessibilitySystemActionRecents" id="0x0102004d" />
+    <public type="id" name="accessibilitySystemActionNotifications" id="0x0102004e" />
+    <public type="id" name="accessibilitySystemActionQuickSettings" id="0x0102004f" />
+    <public type="id" name="accessibilitySystemActionPowerDialog" id="0x01020050" />
+    <public type="id" name="accessibilitySystemActionToggleSplitScreen" id="0x01020051" />
+    <public type="id" name="accessibilitySystemActionLockScreen" id="0x01020052" />
+    <public type="id" name="accessibilitySystemActionTakeScreenshot" id="0x01020053" />
+    <public type="id" name="accessibilityActionImeEnter" id="0x01020054" />
 
   <!-- ===============================================================
-       Resources added in version R of the platform
+       Resources added in version S of the platform
 
        NOTE: add <public> elements within a <public-group> like so:
 
@@ -2995,88 +3037,39 @@
        value above is 0x01010530, so the public-group of attrs below has
        the id value of 0x01010531.
        =============================================================== -->
-  <eat-comment />
 
-    <public-group type="attr" first-id="0x01010607">
-      <public name="importantForContentCapture" />
-      <public name="forceQueryable" />
-      <public name="resourcesMap" />
-      <public name="animatedImageDrawable"/>
-      <public name="htmlDescription"/>
-      <public name="preferMinimalPostProcessing"/>
-      <!-- @removed -->
-      <public name="featureId" />
-      <public name="supportsInlineSuggestions" />
-      <public name="crossProfile" />
-      <public name="canTakeScreenshot"/>
-      <!-- @hide @SystemApi -->
-      <public name="sdkVersion" />
-      <!-- @hide @SystemApi -->
-      <public name="minExtensionVersion" />
-      <public name="allowNativeHeapPointerTagging" />
-      <!-- @hide no longer used, kept to preserve padding -->
-      <public name="allowAutoRevokePermissionsExemption"/>
-      <public name="autoRevokePermissions" />
-      <public name="preserveLegacyExternalStorage" />
-      <public name="mimeGroup" />
-      <public name="gwpAsanMode" />
-      <!-- @hide -->
-      <public name="scrollCaptureHint" />
-    </public-group>
+  <public-group type="attr" first-id="0x01010617">
+    <!-- attribute definitions go here -->
+  </public-group>
 
-    <public-group type="drawable" first-id="0x010800b5">
-    </public-group>
+  <public-group type="drawable" first-id="0x010800b5">
+    <!-- drawable definitions go here -->
+  </public-group>
 
-    <public-group type="style" first-id="0x010302e5">
-    </public-group>
+  <public-group type="color" first-id="0x0106001d">
+    <!-- color definitions go here -->
+  </public-group>
 
-    <public-group type="id" first-id="0x0102004a">
-      <public name="accessibilityActionPressAndHold" />
-    </public-group>
+  <public-group type="dimen" first-id="0x01050008">
+    <!-- dimension definitions go here -->
+  </public-group>
 
-    <public-group type="string" first-id="0x01040025">
-      <!-- @hide -->
-      <public name="notification_channel_network_status" />
-      <!-- @hide -->
-      <public name="notification_channel_network_alerts" />
-      <!-- @hide -->
-      <public name="notification_channel_network_available" />
-      <!-- @hide @SystemApi -->
-      <public name="config_defaultCallRedirection" />
-      <!-- @hide @SystemApi -->
-      <public name="config_defaultCallScreening" />
-      <!-- @hide @SystemApi @TestApi -->
-      <public name="config_systemGallery" />
-    </public-group>
+  <public-group type="bool" first-id="0x01110005">
+    <!-- boolean definitions go here -->
+  </public-group>
 
-    <public-group type="bool" first-id="0x01110005">
-    </public-group>
+  <public-group type="style" first-id="0x010302e5">
+    <!-- style definitions go here -->
+  </public-group>
 
-    <public-group type="dimen" first-id="0x01050008">
-    </public-group>
+  <public-group type="string" first-id="0x01040028">
+    <!-- string definitions go here -->
+  </public-group>
 
-    <public-group type="color" first-id="0x0106001d">
-    </public-group>
+  <public-group type="id" first-id="0x01020055">
+    <!-- id definitions go here -->
+  </public-group>
 
-    <public-group type="id" first-id="0x0102004b">
-      <public name="accessibilitySystemActionBack" />
-      <public name="accessibilitySystemActionHome" />
-      <public name="accessibilitySystemActionRecents" />
-      <public name="accessibilitySystemActionNotifications" />
-      <public name="accessibilitySystemActionQuickSettings" />
-      <public name="accessibilitySystemActionPowerDialog" />
-      <public name="accessibilitySystemActionToggleSplitScreen" />
-      <public name="accessibilitySystemActionLockScreen" />
-      <public name="accessibilitySystemActionTakeScreenshot" />
-      <public name="accessibilityActionImeEnter" />
-    </public-group>
-
-    <public-group type="string" first-id="0x0104002c">
-      <!-- @hide -->
-      <public name="config_customMediaKeyDispatcher" />
-      <!-- @hide -->
-      <public name="config_customSessionPolicyProvider" />
-    </public-group>
   <!-- ===============================================================
        DO NOT ADD UN-GROUPED ITEMS HERE
 
@@ -3085,4 +3078,5 @@
        Items added outside of a group may have their value recalculated
        every time something new is added to this file.
        =============================================================== -->
+
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 53e0bf9c2a318..3dc3b0b0acbea 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3994,4 +3994,9 @@
   <java-symbol type="bool" name="config_assistantOnTopOfDream"/>
 
   <java-symbol type="string" name="config_overrideComponentUiPackage" />
+
+  <java-symbol type="string" name="notification_channel_network_status" />
+  <java-symbol type="string" name="notification_channel_network_alerts" />
+  <java-symbol type="string" name="notification_channel_network_available" />
+
 </resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java b/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java
index ca841a5cdcd6a..5e5a9d9b2ec8c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java
@@ -44,7 +44,8 @@ public class WifiSoftApConfigChangedNotifier {
         // create channel, or update it if it already exists
         NotificationChannel channel = new NotificationChannel(
                 SystemNotificationChannels.NETWORK_STATUS,
-                context.getString(android.R.string.notification_channel_network_status),
+                context.getString(
+                        com.android.internal.R.string.notification_channel_network_status),
                 NotificationManager.IMPORTANCE_LOW);
         notificationManager.createNotificationChannel(channel);
 
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index e869e57992733..b753de9b264be 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -120,6 +120,7 @@ import com.android.server.SystemConfig;
 import com.android.server.Watchdog;
 import com.android.server.compat.PlatformCompat;
 import com.android.server.pm.dex.DexManager;
+import com.android.server.pm.parsing.pkg.AndroidPackage;
 import com.android.server.wm.ActivityServiceConnectionsHolder;
 import com.android.server.wm.WindowManagerService;
 
@@ -2169,7 +2170,12 @@ public final class ProcessList {
         Map<String, Pair<String, Long>> result = new ArrayMap<>(packages.length);
         int userId = UserHandle.getUserId(uid);
         for (String packageName : packages) {
-            String volumeUuid = pmInt.getPackage(packageName).getVolumeUuid();
+            AndroidPackage androidPackage = pmInt.getPackage(packageName);
+            if (androidPackage == null) {
+                Slog.w(TAG, "Unknown package:" + packageName);
+                continue;
+            }
+            String volumeUuid = androidPackage.getVolumeUuid();
             long inode = pmInt.getCeDataInode(packageName, userId);
             if (inode == 0) {
                 Slog.w(TAG, packageName + " inode == 0 (b/152760674)");
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index 27ffcdf52168f..04fbbe1f1069d 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -45,6 +45,7 @@ enum {
     SDK_O_MR1 = 27,
     SDK_P = 28,
     SDK_Q = 29,
+    SDK_R = 30,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index b4b6ff1daaaad..f9faed84f5f00 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -57,6 +57,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
     {0x0568, SDK_O},
     {0x056d, SDK_O_MR1},
     {0x0586, SDK_P},
+    {0x0606, SDK_Q},
+    {0x0617, SDK_R},
 };
 
 static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index a00d978565ade..aa9aa12d2cee3 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -55,6 +55,7 @@ enum : ApiVersion {
   SDK_O_MR1 = 27,
   SDK_P = 28,
   SDK_Q = 29,
+  SDK_R = 30,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);