diff --git a/api/current.txt b/api/current.txt
index d83fedee2a5e6..1b3ecc3ff88c9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -309,7 +309,6 @@ package android {
     field public static final int addStatesFromChildren = 16842992; // 0x10100f0
     field public static final int adjustViewBounds = 16843038; // 0x101011e
     field public static final int advancedPrintOptionsActivity = 16843761; // 0x10103f1
-    field public static final int ageHint = 16843962; // 0x10104ba
     field public static final int alertDialogIcon = 16843605; // 0x1010355
     field public static final int alertDialogStyle = 16842845; // 0x101005d
     field public static final int alertDialogTheme = 16843529; // 0x1010309
@@ -459,6 +458,7 @@ package android {
     field public static final int configure = 16843357; // 0x101025d
     field public static final int constantSize = 16843158; // 0x1010196
     field public static final int content = 16843355; // 0x101025b
+    field public static final int contentAgeHint = 16843962; // 0x10104ba
     field public static final int contentAuthority = 16843408; // 0x1010290
     field public static final int contentDescription = 16843379; // 0x1010273
     field public static final int contentInsetEnd = 16843860; // 0x1010454
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index ae11eea4100b7..f825c29f2d42e 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -7364,7 +7364,8 @@
         <attr name="title" />
         <!-- The short description of the content rating system. -->
         <attr name="description" />
-        <!-- The country associated with the content rating system. -->
+        <!-- The country code associated with the content rating system, which consists of two
+             uppercase letters that conform to the ISO 3166 standard. -->
         <attr name="country" format="string" />
     </declare-styleable>
 
@@ -7381,7 +7382,7 @@
         <attr name="description" />
         <!-- The age associated with the content rating. The content of this rating is suitable for
              people of this age or above. -->
-        <attr name="ageHint" format="integer" />
+        <attr name="contentAgeHint" format="integer" />
     </declare-styleable>
 
     <declare-styleable name="ResolverDrawerLayout">
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index c4c046c936c8d..eca6c72ee3a9d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2273,7 +2273,7 @@
   <public type="attr" name="letterSpacing" />
   <public type="attr" name="fontFeatureSettings" />
   <public type="attr" name="outlineProvider" />
-  <public type="attr" name="ageHint" />
+  <public type="attr" name="contentAgeHint" />
   <public type="attr" name="country" />
   <public type="attr" name="windowSharedElementsUseOverlay" />
   <public type="attr" name="reparent" />