[go: nahoru, domu]

Update lint baselines for forked RestrictedApi check

Fixes: 297047524
Test: ./gradlew lintDebug
Change-Id: I687bae735b882e1da3f297111ff4cbccb79ac94b
diff --git a/appactions/interaction/interaction-capabilities-communication/lint-baseline.xml b/appactions/interaction/interaction-capabilities-communication/lint-baseline.xml
index 7226911..ff29394 100644
--- a/appactions/interaction/interaction-capabilities-communication/lint-baseline.xml
+++ b/appactions/interaction/interaction-capabilities-communication/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
diff --git a/appactions/interaction/interaction-capabilities-core/lint-baseline.xml b/appactions/interaction/interaction-capabilities-core/lint-baseline.xml
index c939b1a..9a5974f 100644
--- a/appactions/interaction/interaction-capabilities-core/lint-baseline.xml
+++ b/appactions/interaction/interaction-capabilities-core/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.newBuilder can only be called from within the same library (:)"
         errorLine1="    ): AppAction = AppAction.newBuilder()"
         errorLine2="                             ~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="            .setName(capabilityName)"
         errorLine2="             ~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="            .setIdentifier(identifier)"
         errorLine2="             ~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllParams can only be called from within the same library (:)"
         errorLine1="            .addAllParams("
         errorLine2="             ~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTaskInfo can only be called from within the same library (:)"
         errorLine1="            .setTaskInfo("
         errorLine2="             ~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSupportsPartialFulfillment can only be called from within the same library (:)"
         errorLine1="                TaskInfo.newBuilder().setSupportsPartialFulfillment(supportsPartialFulfillment)"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TaskInfo.newBuilder can only be called from within the same library (:)"
         errorLine1="                TaskInfo.newBuilder().setSupportsPartialFulfillment(supportsPartialFulfillment)"
         errorLine2="                         ~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StructuredOutput.newBuilder can only be called from within the same library (:)"
         errorLine1="        val outputBuilder = FulfillmentResponse.StructuredOutput.newBuilder()"
         errorLine2="                                                                 ~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addOutputValues can only be called from within the same library (:)"
         errorLine1="                outputBuilder.addOutputValues("
         errorLine2="                              ~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                    FulfillmentResponse.StructuredOutput.OutputValue.newBuilder()"
         errorLine2="                                                                     ~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="                        .setName(entry.key)"
         errorLine2="                         ~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library (:)"
         errorLine1="                        .addAllValues(paramValues)"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNKNOWN_TYPE ||"
         errorLine2="                            ~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNKNOWN_TYPE ||"
         errorLine2="                            ~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.UNKNOWN_TYPE can only be accessed from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNKNOWN_TYPE ||"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNRECOGNIZED"
         errorLine2="                            ~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNRECOGNIZED"
         errorLine2="                            ~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.UNRECOGNIZED can only be accessed from within the same library (:)"
         errorLine1="                fulfillment.type == Fulfillment.Type.UNRECOGNIZED"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getSyncStatus can only be called from within the same library (:)"
         errorLine1="                RequestMetadata(fulfillment.type, fulfillment.syncStatus)"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getSyncStatus can only be called from within the same library (:)"
         errorLine1="                RequestMetadata(fulfillment.type, fulfillment.syncStatus)"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                RequestMetadata(fulfillment.type, fulfillment.syncStatus)"
         errorLine2="                                            ~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getType can only be called from within the same library (:)"
         errorLine1="                RequestMetadata(fulfillment.type, fulfillment.syncStatus)"
         errorLine2="                                            ~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getParamsList can only be called from within the same library (:)"
         errorLine1="            for (fp in fulfillment.paramsList) {"
         errorLine2="                                   ~~~~~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getParamsList can only be called from within the same library (:)"
         errorLine1="            for (fp in fulfillment.paramsList) {"
         errorLine2="                                   ~~~~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.getFulfillmentValuesList can only be called from within the same library (:)"
         errorLine1="                result[fp.name] = fp.fulfillmentValuesList"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.getFulfillmentValuesList can only be called from within the same library (:)"
         errorLine1="                result[fp.name] = fp.fulfillmentValuesList"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.getName can only be called from within the same library (:)"
         errorLine1="                result[fp.name] = fp.fulfillmentValuesList"
         errorLine2="                          ~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.getName can only be called from within the same library (:)"
         errorLine1="                result[fp.name] = fp.fulfillmentValuesList"
         errorLine2="                          ~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.newBuilder can only be called from within the same library (:)"
         errorLine1="        val builder = IntentParameter.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="            .setName(slotName)"
         errorLine2="             ~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIsRequired can only be called from within the same library (:)"
         errorLine1="            .setIsRequired(property.isRequiredForExecution)"
         errorLine2="             ~~~~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEntityMatchRequired can only be called from within the same library (:)"
         errorLine1="            .setEntityMatchRequired(property.shouldMatchPossibleValues)"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIsProhibited can only be called from within the same library (:)"
         errorLine1="            .setIsProhibited(!property.isSupported)"
         errorLine2="             ~~~~~~~~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addPossibleEntities can only be called from within the same library (:)"
         errorLine1="            builder.addPossibleEntities(it)"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                typeSpec.getIdentifier(obj)?.let { builder.setIdentifier(it) }"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                typeSpec.getIdentifier(obj)?.let { builder.setIdentifier(it) }"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.newBuilder can only be called from within the same library (:)"
         errorLine1="            val builder = Entity.newBuilder()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                value.hasStringValue() -> builder.stringValue = value.stringValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                value.hasStringValue() -> builder.stringValue = value.stringValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBoolValue can only be called from within the same library (:)"
         errorLine1="                value.hasBoolValue() -> builder.boolValue = value.boolValue"
         errorLine2="                                                ~~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBoolValue can only be called from within the same library (:)"
         errorLine1="                value.hasBoolValue() -> builder.boolValue = value.boolValue"
         errorLine2="                                                ~~~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                value.hasNumberValue() -> builder.numberValue = value.numberValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                value.hasNumberValue() -> builder.numberValue = value.numberValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                value.hasStructValue() -> builder.structValue = value.structValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                value.hasStructValue() -> builder.structValue = value.structValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                converter.toSearchAction(request.request.searchAction)"
         errorLine2="                                                 ~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                converter.toSearchAction(request.request.searchAction)"
         errorLine2="                                                 ~~~~~~~">
@@ -425,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getSearchAction can only be called from within the same library (:)"
         errorLine1="                converter.toSearchAction(request.request.searchAction)"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -434,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getSearchAction can only be called from within the same library (:)"
         errorLine1="                converter.toSearchAction(request.request.searchAction)"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -443,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.INVALID_ENTITY_ARGUMENT can only be accessed from within the same library (:)"
         errorLine1="                return createResponse(GroundingResponse.Status.INVALID_ENTITY_ARGUMENT)"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -452,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                .setPageSize(request.request.pageSize)"
         errorLine2="                                     ~~~~~~~">
@@ -461,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                .setPageSize(request.request.pageSize)"
         errorLine2="                                     ~~~~~~~">
@@ -470,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getPageSize can only be called from within the same library (:)"
         errorLine1="                .setPageSize(request.request.pageSize)"
         errorLine2="                                             ~~~~~~~~">
@@ -479,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getPageSize can only be called from within the same library (:)"
         errorLine1="                .setPageSize(request.request.pageSize)"
         errorLine2="                                             ~~~~~~~~">
@@ -488,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                .setPageToken(request.request.pageToken)"
         errorLine2="                                      ~~~~~~~">
@@ -497,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="                .setPageToken(request.request.pageToken)"
         errorLine2="                                      ~~~~~~~">
@@ -506,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getPageToken can only be called from within the same library (:)"
         errorLine1="                .setPageToken(request.request.pageToken)"
         errorLine2="                                              ~~~~~~~~~">
@@ -515,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getPageToken can only be called from within the same library (:)"
         errorLine1="                .setPageToken(request.request.pageToken)"
         errorLine2="                                              ~~~~~~~~~">
@@ -524,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="        return GroundingResponse.newBuilder()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -533,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResponse can only be called from within the same library (:)"
         errorLine1="            .setResponse(GroundingResponse.Response.newBuilder().setStatus(status))"
         errorLine2="             ~~~~~~~~~~~">
@@ -542,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="            .setResponse(GroundingResponse.Response.newBuilder().setStatus(status))"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -551,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Response.newBuilder can only be called from within the same library (:)"
         errorLine1="            .setResponse(GroundingResponse.Response.newBuilder().setStatus(status))"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -560,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="            GroundingResponse.Response.newBuilder().setStatus(GroundingResponse.Status.SUCCESS)"
         errorLine2="                                                    ~~~~~~~~~">
@@ -569,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Response.newBuilder can only be called from within the same library (:)"
         errorLine1="            GroundingResponse.Response.newBuilder().setStatus(GroundingResponse.Status.SUCCESS)"
         errorLine2="                                       ~~~~~~~~~~">
@@ -578,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.SUCCESS can only be accessed from within the same library (:)"
         errorLine1="            GroundingResponse.Response.newBuilder().setStatus(GroundingResponse.Status.SUCCESS)"
         errorLine2="                                                                                       ~~~~~~~">
@@ -587,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addCandidates can only be called from within the same library (:)"
         errorLine1="            builder.addCandidates("
         errorLine2="                    ~~~~~~~~~~~~~">
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Candidate.newBuilder can only be called from within the same library (:)"
         errorLine1="                GroundingResponse.Candidate.newBuilder()"
         errorLine2="                                            ~~~~~~~~~~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setGroundedEntity can only be called from within the same library (:)"
         errorLine1="                    .setGroundedEntity("
         errorLine2="                     ~~~~~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResponse can only be called from within the same library (:)"
         errorLine1="        return GroundingResponse.newBuilder().setResponse(builder.build()).build()"
         errorLine2="                                              ~~~~~~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="        return GroundingResponse.newBuilder().setResponse(builder.build()).build()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.CANCELED can only be accessed from within the same library (:)"
         errorLine1="            EntityLookupResponse.CANCELED -> GroundingResponse.Status.CANCELED"
         errorLine2="                                                                      ~~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.INVALID_PAGE_TOKEN can only be accessed from within the same library (:)"
         errorLine1="            EntityLookupResponse.INVALID_PAGE_TOKEN -> GroundingResponse.Status.INVALID_PAGE_TOKEN"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.TIMEOUT can only be accessed from within the same library (:)"
         errorLine1="            EntityLookupResponse.TIMEOUT -> GroundingResponse.Status.TIMEOUT"
         errorLine2="                                                                     ~~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.DEFAULT_UNKNOWN can only be accessed from within the same library (:)"
         errorLine1="            else -> GroundingResponse.Status.DEFAULT_UNKNOWN"
         errorLine2="                                             ~~~~~~~~~~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                typeSpec.getIdentifier(obj)?.let { builder.setIdentifier(it) }"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                typeSpec.getIdentifier(obj)?.let { builder.setIdentifier(it) }"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStringValue() -> builder.stringValue = paramValue.stringValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStringValue() -> builder.stringValue = paramValue.stringValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStringValue() -> builder.stringValue = paramValue.stringValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStringValue() -> builder.stringValue = paramValue.stringValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasStringValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStringValue() -> builder.stringValue = paramValue.stringValue"
         errorLine2="                           ~~~~~~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasBoolValue() -> builder.boolValue = paramValue.boolValue"
         errorLine2="                                                                            ~~~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasBoolValue() -> builder.boolValue = paramValue.boolValue"
         errorLine2="                                                                            ~~~~~~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasBoolValue() -> builder.boolValue = paramValue.boolValue"
         errorLine2="                                                                            ~~~~~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasBoolValue() -> builder.boolValue = paramValue.boolValue"
         errorLine2="                                                                            ~~~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasBoolValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasBoolValue() -> builder.boolValue = paramValue.boolValue"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasNumberValue() -> builder.numberValue = paramValue.numberValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasNumberValue() -> builder.numberValue = paramValue.numberValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasNumberValue() -> builder.numberValue = paramValue.numberValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasNumberValue() -> builder.numberValue = paramValue.numberValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasNumberValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasNumberValue() -> builder.numberValue = paramValue.numberValue"
         errorLine2="                           ~~~~~~~~~~~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStructValue() -> builder.structValue = paramValue.structValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStructValue() -> builder.structValue = paramValue.structValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStructValue() -> builder.structValue = paramValue.structValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStructValue() -> builder.structValue = paramValue.structValue"
         errorLine2="                                                                                ~~~~~~~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasStructValue can only be called from within the same library (:)"
         errorLine1="                paramValue.hasStructValue() -> builder.structValue = paramValue.structValue"
         errorLine2="                           ~~~~~~~~~~~~~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            val builder = ParamValue.newBuilder()"
         errorLine2="                                     ~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                value.hasStringValue() -> builder.stringValue = value.stringValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                value.hasStringValue() -> builder.stringValue = value.stringValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBoolValue can only be called from within the same library (:)"
         errorLine1="                value.hasBoolValue() -> builder.boolValue = value.boolValue"
         errorLine2="                                                ~~~~~~~~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBoolValue can only be called from within the same library (:)"
         errorLine1="                value.hasBoolValue() -> builder.boolValue = value.boolValue"
         errorLine2="                                                ~~~~~~~~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                value.hasNumberValue() -> builder.numberValue = value.numberValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                value.hasNumberValue() -> builder.numberValue = value.numberValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                value.hasStructValue() -> builder.structValue = value.structValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                value.hasStructValue() -> builder.structValue = value.structValue"
         errorLine2="                                                  ~~~~~~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            argumentsWrapper.paramValues.mapValues { entry -> entry.value.mapNotNull { it.value } }"
         errorLine2="                                                                                          ~~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            argumentsWrapper.paramValues.mapValues { entry -> entry.value.mapNotNull { it.value } }"
         errorLine2="                                                                                          ~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartDictation can only be called from within the same library (:)"
         errorLine1="            FulfillmentResponse.newBuilder().setStartDictation(executionResult.shouldStartDictation)"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="            FulfillmentResponse.newBuilder().setStartDictation(executionResult.shouldStartDictation)"
         errorLine2="                                ~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExecutionOutput can only be called from within the same library (:)"
         errorLine1="            fulfillmentResponseBuilder.setExecutionOutput("
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getIsRequired can only be called from within the same library (:)"
         errorLine1="    ) = paramsList.filter { it.isRequired }.map { it.name }.all { finalArguments.containsKey(it) }"
         errorLine2="                               ~~~~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getIsRequired can only be called from within the same library (:)"
         errorLine1="    ) = paramsList.filter { it.isRequired }.map { it.name }.all { finalArguments.containsKey(it) }"
         errorLine2="                               ~~~~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="    ) = paramsList.filter { it.isRequired }.map { it.name }.all { finalArguments.containsKey(it) }"
         errorLine2="                                                     ~~~~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="    ) = paramsList.filter { it.isRequired }.map { it.name }.all { finalArguments.containsKey(it) }"
         errorLine2="                                                     ~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="            FulfillmentRequest.Fulfillment.FulfillmentValue.newBuilder().setValue(it).build()"
         errorLine2="                                                                         ~~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            FulfillmentRequest.Fulfillment.FulfillmentValue.newBuilder().setValue(it).build()"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="        CurrentValue.newBuilder().setValue(paramValue).setStatus(status).build()"
         errorLine2="                                                       ~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="        CurrentValue.newBuilder().setValue(paramValue).setStatus(status).build()"
         errorLine2="                                  ~~~~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="        CurrentValue.newBuilder().setValue(paramValue).setStatus(status).build()"
         errorLine2="                     ~~~~~~~~~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="        val result = CurrentValue.newBuilder()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.hasValue can only be called from within the same library (:)"
         errorLine1="        if (fulfillmentValue.hasValue()) {"
         errorLine2="                             ~~~~~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                   ~~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                   ~~~~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                                            ~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                                            ~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                                            ~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="            result.value = fulfillmentValue.value"
         errorLine2="                                            ~~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.hasDisambigData can only be called from within the same library (:)"
         errorLine1="        if (fulfillmentValue.hasDisambigData()) {"
         errorLine2="                             ~~~~~~~~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDisambiguationData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDisambiguationData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getDisambigData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -1181,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getDisambigData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -1190,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getDisambigData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -1199,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getDisambigData can only be called from within the same library (:)"
         errorLine1="            result.disambiguationData = fulfillmentValue.disambigData"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -1208,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="        return result.setStatus(status).build()"
         errorLine2="                      ~~~~~~~~~">
@@ -1217,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.hasStructValue can only be called from within the same library (:)"
         errorLine1="        if (groundedEntity.hasStructValue())"
         errorLine2="                           ~~~~~~~~~~~~~~">
@@ -1226,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            ParamValue.newBuilder()"
         errorLine2="                       ~~~~~~~~~~">
@@ -1235,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -1244,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1253,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1262,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue(groundedEntity.structValue)"
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -1271,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue(groundedEntity.structValue)"
         errorLine2="                                               ~~~~~~~~~~~">
@@ -1280,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue(groundedEntity.structValue)"
         errorLine2="                                               ~~~~~~~~~~~">
@@ -1289,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            ParamValue.newBuilder()"
         errorLine2="                       ~~~~~~~~~~">
@@ -1298,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -1307,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1316,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setIdentifier(groundedEntity.identifier)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1325,7 +1325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                .setStringValue(groundedEntity.name)"
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -1334,7 +1334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getName can only be called from within the same library (:)"
         errorLine1="                .setStringValue(groundedEntity.name)"
         errorLine2="                                               ~~~~">
@@ -1343,7 +1343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getName can only be called from within the same library (:)"
         errorLine1="                .setStringValue(groundedEntity.name)"
         errorLine2="                                               ~~~~">
@@ -1352,7 +1352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="        CurrentValue.newBuilder()"
         errorLine2="                     ~~~~~~~~~~">
@@ -1361,7 +1361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="            .setValue(paramValue)"
         errorLine2="             ~~~~~~~~">
@@ -1370,7 +1370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="            .setStatus(CurrentValue.Status.DISAMBIG)"
         errorLine2="             ~~~~~~~~~">
@@ -1379,7 +1379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.DISAMBIG can only be accessed from within the same library (:)"
         errorLine1="            .setStatus(CurrentValue.Status.DISAMBIG)"
         errorLine2="                                           ~~~~~~~~">
@@ -1388,7 +1388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDisambiguationData can only be called from within the same library (:)"
         errorLine1="            .setDisambiguationData("
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~">
@@ -1397,7 +1397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllEntities can only be called from within the same library (:)"
         errorLine1="                DisambiguationData.newBuilder().addAllEntities(disambiguationEntities)"
         errorLine2="                                                ~~~~~~~~~~~~~~">
@@ -1406,7 +1406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DisambiguationData.newBuilder can only be called from within the same library (:)"
         errorLine1="                DisambiguationData.newBuilder().addAllEntities(disambiguationEntities)"
         errorLine2="                                   ~~~~~~~~~~">
@@ -1415,7 +1415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                   ~~~~~~~~~">
@@ -1424,7 +1424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                   ~~~~~~~~~">
@@ -1433,7 +1433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                                              ~~~~~~~~~">
@@ -1442,7 +1442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                                              ~~~~~~~~~">
@@ -1451,7 +1451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.getNumber can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                             ~~~~~~">
@@ -1460,7 +1460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.getNumber can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                             ~~~~~~">
@@ -1469,7 +1469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.getNumber can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                                                        ~~~~~~">
@@ -1478,7 +1478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.getNumber can only be called from within the same library (:)"
         errorLine1="        if (oldArg.valueCase.number != newArg.valueCase.number) {"
         errorLine2="                                                        ~~~~~~">
@@ -1487,7 +1487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="        return if (oldArg.identifier != newArg.identifier) {"
         errorLine2="                          ~~~~~~~~~~">
@@ -1496,7 +1496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="        return if (oldArg.identifier != newArg.identifier) {"
         errorLine2="                          ~~~~~~~~~~">
@@ -1505,7 +1505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="        return if (oldArg.identifier != newArg.identifier) {"
         errorLine2="                                               ~~~~~~~~~~">
@@ -1514,7 +1514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="        return if (oldArg.identifier != newArg.identifier) {"
         errorLine2="                                               ~~~~~~~~~~">
@@ -1523,7 +1523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="            when (oldArg.valueCase) {"
         errorLine2="                         ~~~~~~~~~">
@@ -1532,7 +1532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getValueCase can only be called from within the same library (:)"
         errorLine1="            when (oldArg.valueCase) {"
         errorLine2="                         ~~~~~~~~~">
@@ -1541,7 +1541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.VALUE_NOT_SET can only be accessed from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.VALUE_NOT_SET -> false"
         errorLine2="                                     ~~~~~~~~~~~~~">
@@ -1550,7 +1550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRING_VALUE -> oldArg.stringValue != newArg.stringValue"
         errorLine2="                                                            ~~~~~~~~~~~">
@@ -1559,7 +1559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRING_VALUE -> oldArg.stringValue != newArg.stringValue"
         errorLine2="                                                            ~~~~~~~~~~~">
@@ -1568,7 +1568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRING_VALUE -> oldArg.stringValue != newArg.stringValue"
         errorLine2="                                                                                  ~~~~~~~~~~~">
@@ -1577,7 +1577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStringValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRING_VALUE -> oldArg.stringValue != newArg.stringValue"
         errorLine2="                                                                                  ~~~~~~~~~~~">
@@ -1586,7 +1586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.STRING_VALUE can only be accessed from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRING_VALUE -> oldArg.stringValue != newArg.stringValue"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -1595,7 +1595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.BOOL_VALUE -> oldArg.boolValue != newArg.boolValue"
         errorLine2="                                                          ~~~~~~~~~">
@@ -1604,7 +1604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.BOOL_VALUE -> oldArg.boolValue != newArg.boolValue"
         errorLine2="                                                          ~~~~~~~~~">
@@ -1613,7 +1613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.BOOL_VALUE -> oldArg.boolValue != newArg.boolValue"
         errorLine2="                                                                              ~~~~~~~~~">
@@ -1622,7 +1622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getBoolValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.BOOL_VALUE -> oldArg.boolValue != newArg.boolValue"
         errorLine2="                                                                              ~~~~~~~~~">
@@ -1631,7 +1631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.BOOL_VALUE can only be accessed from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.BOOL_VALUE -> oldArg.boolValue != newArg.boolValue"
         errorLine2="                                     ~~~~~~~~~~">
@@ -1640,7 +1640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.NUMBER_VALUE -> oldArg.numberValue != newArg.numberValue"
         errorLine2="                                                            ~~~~~~~~~~~">
@@ -1649,7 +1649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.NUMBER_VALUE -> oldArg.numberValue != newArg.numberValue"
         errorLine2="                                                            ~~~~~~~~~~~">
@@ -1658,7 +1658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.NUMBER_VALUE -> oldArg.numberValue != newArg.numberValue"
         errorLine2="                                                                                  ~~~~~~~~~~~">
@@ -1667,7 +1667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getNumberValue can only be called from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.NUMBER_VALUE -> oldArg.numberValue != newArg.numberValue"
         errorLine2="                                                                                  ~~~~~~~~~~~">
@@ -1676,7 +1676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.NUMBER_VALUE can only be accessed from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.NUMBER_VALUE -> oldArg.numberValue != newArg.numberValue"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -1685,7 +1685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.STRUCT_VALUE can only be accessed from within the same library (:)"
         errorLine1="                ParamValue.ValueCase.STRUCT_VALUE ->"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -1694,7 +1694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                        oldArg.structValue.toByteArray(),"
         errorLine2="                               ~~~~~~~~~~~">
@@ -1703,7 +1703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                        oldArg.structValue.toByteArray(),"
         errorLine2="                               ~~~~~~~~~~~">
@@ -1712,7 +1712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                        newArg.structValue.toByteArray()"
         errorLine2="                               ~~~~~~~~~~~">
@@ -1721,7 +1721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                        newArg.structValue.toByteArray()"
         errorLine2="                               ~~~~~~~~~~~">
@@ -1730,7 +1730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="        currentValues.all { it.status == CurrentValue.Status.ACCEPTED } &amp;&amp;"
         errorLine2="                               ~~~~~~">
@@ -1739,7 +1739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="        currentValues.all { it.status == CurrentValue.Status.ACCEPTED } &amp;&amp;"
         errorLine2="                               ~~~~~~">
@@ -1748,7 +1748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="        currentValues.all { it.status == CurrentValue.Status.ACCEPTED } &amp;&amp;"
         errorLine2="                                                             ~~~~~~~~">
@@ -1757,7 +1757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                !hasParamValueDiff(currentValues[it].value, fulfillmentValues[it].value)"
         errorLine2="                                                     ~~~~~">
@@ -1766,7 +1766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                !hasParamValueDiff(currentValues[it].value, fulfillmentValues[it].value)"
         errorLine2="                                                     ~~~~~">
@@ -1775,7 +1775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="                !hasParamValueDiff(currentValues[it].value, fulfillmentValues[it].value)"
         errorLine2="                                                                                  ~~~~~">
@@ -1784,7 +1784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="                !hasParamValueDiff(currentValues[it].value, fulfillmentValues[it].value)"
         errorLine2="                                                                                  ~~~~~">
@@ -1793,7 +1793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                currentValue.status == CurrentValue.Status.ACCEPTED &amp;&amp;"
         errorLine2="                             ~~~~~~">
@@ -1802,7 +1802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                currentValue.status == CurrentValue.Status.ACCEPTED &amp;&amp;"
         errorLine2="                             ~~~~~~">
@@ -1811,7 +1811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="                currentValue.status == CurrentValue.Status.ACCEPTED &amp;&amp;"
         errorLine2="                                                           ~~~~~~~~">
@@ -1820,7 +1820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                    currentValue.value.hasStructValue()"
         errorLine2="                                 ~~~~~">
@@ -1829,7 +1829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                    currentValue.value.hasStructValue()"
         errorLine2="                                 ~~~~~">
@@ -1838,7 +1838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasStructValue can only be called from within the same library (:)"
         errorLine1="                    currentValue.value.hasStructValue()"
         errorLine2="                                       ~~~~~~~~~~~~~~">
@@ -1847,7 +1847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                        ~~~~~">
@@ -1856,7 +1856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                        ~~~~~">
@@ -1865,7 +1865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                                                         ~~~~~">
@@ -1874,7 +1874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                                                         ~~~~~">
@@ -1883,7 +1883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1892,7 +1892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                              ~~~~~~~~~~">
@@ -1901,7 +1901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                                                               ~~~~~~~~~~~">
@@ -1910,7 +1910,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getStructValue can only be called from within the same library (:)"
         errorLine1="                candidates[currentValue.value.identifier] = currentValue.value.structValue"
         errorLine2="                                                                               ~~~~~~~~~~~">
@@ -1919,7 +1919,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="            } else if (currentValue.status == CurrentValue.Status.DISAMBIG) {"
         errorLine2="                                    ~~~~~~">
@@ -1928,7 +1928,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="            } else if (currentValue.status == CurrentValue.Status.DISAMBIG) {"
         errorLine2="                                    ~~~~~~">
@@ -1937,7 +1937,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.DISAMBIG can only be accessed from within the same library (:)"
         errorLine1="            } else if (currentValue.status == CurrentValue.Status.DISAMBIG) {"
         errorLine2="                                                                  ~~~~~~~~">
@@ -1946,7 +1946,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getDisambiguationData can only be called from within the same library (:)"
         errorLine1="                for (entity in currentValue.disambiguationData.entitiesList) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
@@ -1955,7 +1955,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getDisambiguationData can only be called from within the same library (:)"
         errorLine1="                for (entity in currentValue.disambiguationData.entitiesList) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
@@ -1964,7 +1964,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DisambiguationData.getEntitiesList can only be called from within the same library (:)"
         errorLine1="                for (entity in currentValue.disambiguationData.entitiesList) {"
         errorLine2="                                                               ~~~~~~~~~~~~">
@@ -1973,7 +1973,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DisambiguationData.getEntitiesList can only be called from within the same library (:)"
         errorLine1="                for (entity in currentValue.disambiguationData.entitiesList) {"
         errorLine2="                                                               ~~~~~~~~~~~~">
@@ -1982,7 +1982,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.hasStructValue can only be called from within the same library (:)"
         errorLine1="                    if (entity.hasStructValue()) {"
         errorLine2="                               ~~~~~~~~~~~~~~">
@@ -1991,7 +1991,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                        candidates[entity.identifier] = entity.structValue"
         errorLine2="                                          ~~~~~~~~~~">
@@ -2000,7 +2000,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="                        candidates[entity.identifier] = entity.structValue"
         errorLine2="                                          ~~~~~~~~~~">
@@ -2009,7 +2009,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getStructValue can only be called from within the same library (:)"
         errorLine1="                        candidates[entity.identifier] = entity.structValue"
         errorLine2="                                                               ~~~~~~~~~~~">
@@ -2018,7 +2018,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getStructValue can only be called from within the same library (:)"
         errorLine1="                        candidates[entity.identifier] = entity.structValue"
         errorLine2="                                                               ~~~~~~~~~~~">
@@ -2027,7 +2027,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="                val paramValue = it.value"
         errorLine2="                                    ~~~~~">
@@ -2036,7 +2036,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.getValue can only be called from within the same library (:)"
         errorLine1="                val paramValue = it.value"
         errorLine2="                                    ~~~~~">
@@ -2045,7 +2045,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasIdentifier can only be called from within the same library (:)"
         errorLine1="                    paramValue.hasIdentifier() &amp;&amp;"
         errorLine2="                               ~~~~~~~~~~~~~">
@@ -2054,7 +2054,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasStructValue can only be called from within the same library (:)"
         errorLine1="                        !paramValue.hasStructValue() &amp;&amp;"
         errorLine2="                                    ~~~~~~~~~~~~~~">
@@ -2063,7 +2063,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                        candidates.containsKey(paramValue.identifier)"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -2072,7 +2072,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                        candidates.containsKey(paramValue.identifier)"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -2081,7 +2081,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="                        .setValue("
         errorLine2="                         ~~~~~~~~">
@@ -2090,7 +2090,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                            paramValue.toBuilder().setStructValue(candidates[paramValue.identifier])"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -2099,7 +2099,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                            paramValue.toBuilder().setStructValue(candidates[paramValue.identifier])"
         errorLine2="                                                                                        ~~~~~~~~~~">
@@ -2108,7 +2108,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                            paramValue.toBuilder().setStructValue(candidates[paramValue.identifier])"
         errorLine2="                                                                                        ~~~~~~~~~~">
@@ -2117,7 +2117,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.hasIdentifier can only be called from within the same library (:)"
         errorLine1="            val GROUND_IF_NO_IDENTIFIER = { paramValue: ParamValue -> !paramValue.hasIdentifier() }"
         errorLine2="                                                                                  ~~~~~~~~~~~~~">
@@ -2126,7 +2126,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.UNKNOWN_SYNC_STATUS can only be accessed from within the same library (:)"
         errorLine1="    private var lastKnownSyncStatus = SyncStatus.UNKNOWN_SYNC_STATUS"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -2135,7 +2135,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppDialogState.newBuilder can only be called from within the same library (:)"
         errorLine1="            AppActionsContext.AppDialogState.newBuilder()"
         errorLine2="                                             ~~~~~~~~~~">
@@ -2144,7 +2144,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllParams can only be called from within the same library (:)"
         errorLine1="                .addAllParams("
         errorLine2="                 ~~~~~~~~~~~~">
@@ -2153,7 +2153,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getParamsList can only be called from within the same library (:)"
         errorLine1="                        appAction.paramsList.map { intentParam ->"
         errorLine2="                                  ~~~~~~~~~~">
@@ -2162,7 +2162,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getParamsList can only be called from within the same library (:)"
         errorLine1="                        appAction.paramsList.map { intentParam ->"
         errorLine2="                                  ~~~~~~~~~~">
@@ -2171,7 +2171,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DialogParameter.newBuilder can only be called from within the same library (:)"
         errorLine1="                                AppActionsContext.DialogParameter.newBuilder()"
         errorLine2="                                                                  ~~~~~~~~~~">
@@ -2180,7 +2180,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="                                    .setName(intentParam.name)"
         errorLine2="                                     ~~~~~~~">
@@ -2189,7 +2189,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="                                    .setName(intentParam.name)"
         errorLine2="                                                         ~~~~">
@@ -2198,7 +2198,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="                                    .setName(intentParam.name)"
         errorLine2="                                                         ~~~~">
@@ -2207,7 +2207,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="                            currentValuesMap[intentParam.name]?.let {"
         errorLine2="                                                         ~~~~">
@@ -2216,7 +2216,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="IntentParameter.getName can only be called from within the same library (:)"
         errorLine1="                            currentValuesMap[intentParam.name]?.let {"
         errorLine2="                                                         ~~~~">
@@ -2225,7 +2225,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllCurrentValue can only be called from within the same library (:)"
         errorLine1="                                dialogParameterBuilder.addAllCurrentValue(it)"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
@@ -2234,7 +2234,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setFulfillmentIdentifier(appAction.identifier)"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2243,7 +2243,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getIdentifier can only be called from within the same library (:)"
         errorLine1="                .setFulfillmentIdentifier(appAction.identifier)"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2252,7 +2252,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFulfillmentIdentifier can only be called from within the same library (:)"
         errorLine1="                .setFulfillmentIdentifier(appAction.identifier)"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2261,7 +2261,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.SYNC can only be accessed from within the same library (:)"
         errorLine1="                FulfillmentRequest.Fulfillment.Type.SYNC ->"
         errorLine2="                                                    ~~~~">
@@ -2270,7 +2270,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.CANCEL can only be accessed from within the same library (:)"
         errorLine1="                FulfillmentRequest.Fulfillment.Type.CANCEL -> {"
         errorLine2="                                                    ~~~~~~">
@@ -2279,7 +2279,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentResponse.getDefaultInstance can only be called from within the same library (:)"
         errorLine1="                    FulfillmentResult(FulfillmentResponse.getDefaultInstance())"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~">
@@ -2288,7 +2288,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="                        TaskCapabilityUtils.toCurrentValue(it, CurrentValue.Status.ACCEPTED)"
         errorLine2="                                                                                   ~~~~~~~~">
@@ -2297,7 +2297,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.DISAMBIG can only be accessed from within the same library (:)"
         errorLine1="            if (!anyParamsOfStatus(CurrentValue.Status.DISAMBIG)) {"
         errorLine2="                                                       ~~~~~~~~">
@@ -2306,7 +2306,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TouchEventMetadata.getDefaultInstance can only be called from within the same library (:)"
         errorLine1="                    TouchEventMetadata.getDefaultInstance(),"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
@@ -2315,7 +2315,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.REJECTED can only be accessed from within the same library (:)"
         errorLine1="            anyParamsOfStatus(CurrentValue.Status.REJECTED) ||"
         errorLine2="                                                  ~~~~~~~~">
@@ -2324,7 +2324,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getParamsList can only be called from within the same library (:)"
         errorLine1="            !TaskCapabilityUtils.isSlotFillingComplete(finalArguments, appAction.paramsList) ||"
         errorLine2="                                                                                 ~~~~~~~~~~">
@@ -2333,7 +2333,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getParamsList can only be called from within the same library (:)"
         errorLine1="            !TaskCapabilityUtils.isSlotFillingComplete(finalArguments, appAction.paramsList) ||"
         errorLine2="                                                                                 ~~~~~~~~~~">
@@ -2342,7 +2342,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.SLOTS_COMPLETE can only be accessed from within the same library (:)"
         errorLine1="            lastKnownSyncStatus != SyncStatus.SLOTS_COMPLETE"
         errorLine2="                                              ~~~~~~~~~~~~~~">
@@ -2351,7 +2351,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentResponse.getDefaultInstance can only be called from within the same library (:)"
         errorLine1="            return FulfillmentResponse.getDefaultInstance()"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
@@ -2360,7 +2360,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.SLOTS_INCOMPLETE can only be accessed from within the same library (:)"
         errorLine1="            SyncStatus.SLOTS_INCOMPLETE,"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
@@ -2369,7 +2369,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.SLOTS_COMPLETE can only be accessed from within the same library (:)"
         errorLine1="            SyncStatus.SLOTS_COMPLETE,"
         errorLine2="                       ~~~~~~~~~~~~~~">
@@ -2378,7 +2378,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.INTENT_CONFIRMED can only be accessed from within the same library (:)"
         errorLine1="            SyncStatus.INTENT_CONFIRMED"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
@@ -2387,7 +2387,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.PENDING can only be accessed from within the same library (:)"
         errorLine1="                CurrentValue.Status.PENDING,"
         errorLine2="                                    ~~~~~~~">
@@ -2396,7 +2396,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                    currentValues.all { it.status == CurrentValue.Status.ACCEPTED }"
         errorLine2="                                           ~~~~~~">
@@ -2405,7 +2405,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                    currentValues.all { it.status == CurrentValue.Status.ACCEPTED }"
         errorLine2="                                           ~~~~~~">
@@ -2414,7 +2414,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="                    currentValues.all { it.status == CurrentValue.Status.ACCEPTED }"
         errorLine2="                                                                         ~~~~~~~~">
@@ -2423,7 +2423,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            .mapValues { currentValue -> currentValue.value.map { it.value } }"
         errorLine2="                                                                     ~~~~~">
@@ -2432,7 +2432,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            .mapValues { currentValue -> currentValue.value.map { it.value } }"
         errorLine2="                                                                     ~~~~~">
@@ -2441,7 +2441,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                    currentValues.any { it.status == CurrentValue.Status.PENDING }"
         errorLine2="                                           ~~~~~~">
@@ -2450,7 +2450,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                    currentValues.any { it.status == CurrentValue.Status.PENDING }"
         errorLine2="                                           ~~~~~~">
@@ -2459,7 +2459,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.PENDING can only be accessed from within the same library (:)"
         errorLine1="                    currentValues.any { it.status == CurrentValue.Status.PENDING }"
         errorLine2="                                                                         ~~~~~~~">
@@ -2468,7 +2468,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            .mapValues { currentValues -> currentValues.value.map { it.value } }"
         errorLine2="                                                                       ~~~~~">
@@ -2477,7 +2477,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            .mapValues { currentValues -> currentValues.value.map { it.value } }"
         errorLine2="                                                                       ~~~~~">
@@ -2486,7 +2486,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                currentValues.any { it.status == status }"
         errorLine2="                                       ~~~~~~">
@@ -2495,7 +2495,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getStatus can only be called from within the same library (:)"
         errorLine1="                currentValues.any { it.status == status }"
         errorLine2="                                       ~~~~~~">
@@ -2504,7 +2504,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="        val fulfillmentResponse = FulfillmentResponse.newBuilder()"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -2513,7 +2513,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setConfirmationData can only be called from within the same library (:)"
         errorLine1="        convertToConfirmationOutput(result)?.let { fulfillmentResponse.confirmationData = it }"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~~">
@@ -2522,7 +2522,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setConfirmationData can only be called from within the same library (:)"
         errorLine1="        convertToConfirmationOutput(result)?.let { fulfillmentResponse.confirmationData = it }"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~~">
@@ -2531,7 +2531,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartDictation can only be called from within the same library (:)"
         errorLine1="            FulfillmentResponse.newBuilder().setStartDictation(result.shouldStartDictation)"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~">
@@ -2540,7 +2540,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="            FulfillmentResponse.newBuilder().setStartDictation(result.shouldStartDictation)"
         errorLine2="                                ~~~~~~~~~~">
@@ -2549,7 +2549,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExecutionOutput can only be called from within the same library (:)"
         errorLine1="        convertToExecutionOutput(result)?.let { fulfillmentResponse.executionOutput = it }"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~">
@@ -2558,7 +2558,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExecutionOutput can only be called from within the same library (:)"
         errorLine1="        convertToExecutionOutput(result)?.let { fulfillmentResponse.executionOutput = it }"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~">
@@ -2567,7 +2567,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StructuredOutput.newBuilder can only be called from within the same library (:)"
         errorLine1="        return FulfillmentResponse.StructuredOutput.newBuilder()"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2576,7 +2576,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllOutputValues can only be called from within the same library (:)"
         errorLine1="            .addAllOutputValues("
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
@@ -2585,7 +2585,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                    FulfillmentResponse.StructuredOutput.OutputValue.newBuilder()"
         errorLine2="                                                                     ~~~~~~~~~~">
@@ -2594,7 +2594,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="                        .setName(it.key)"
         errorLine2="                         ~~~~~~~">
@@ -2603,7 +2603,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library (:)"
         errorLine1="                        .addAllValues(it.value.invoke(confirmation))"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -2612,7 +2612,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                        TaskCapabilityUtils.toCurrentValue(it.value, CurrentValue.Status.ACCEPTED)"
         errorLine2="                                                              ~~~~~">
@@ -2621,7 +2621,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                        TaskCapabilityUtils.toCurrentValue(it.value, CurrentValue.Status.ACCEPTED)"
         errorLine2="                                                              ~~~~~">
@@ -2630,7 +2630,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="                        TaskCapabilityUtils.toCurrentValue(it.value, CurrentValue.Status.ACCEPTED)"
         errorLine2="                                                                                         ~~~~~~~~">
@@ -2639,7 +2639,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getDefaultInstance can only be called from within the same library (:)"
         errorLine1="        var groundingResult = AppGroundingResult.ofSuccess(ParamValue.getDefaultInstance())"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~">
@@ -2648,7 +2648,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.hasDisambiguationData can only be called from within the same library (:)"
         errorLine1="            if (pendingValue.hasDisambiguationData()) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
@@ -2657,7 +2657,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            } else if (taskParamBinding.groundingPredicate.invoke(pendingValue.value)) {"
         errorLine2="                                                                               ~~~~~">
@@ -2666,7 +2666,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            } else if (taskParamBinding.groundingPredicate.invoke(pendingValue.value)) {"
         errorLine2="                                                                               ~~~~~">
@@ -2675,7 +2675,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                groundedValues.add(pendingValue.value)"
         errorLine2="                                                ~~~~~">
@@ -2684,7 +2684,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="                groundedValues.add(pendingValue.value)"
         errorLine2="                                                ~~~~~">
@@ -2693,7 +2693,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getDisambiguationData can only be called from within the same library (:)"
         errorLine1="                renderAssistantDisambigData(pendingValue.disambiguationData, taskParamBinding)"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
@@ -2702,7 +2702,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getDisambiguationData can only be called from within the same library (:)"
         errorLine1="                renderAssistantDisambigData(pendingValue.disambiguationData, taskParamBinding)"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
@@ -2711,7 +2711,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                    CurrentValue.newBuilder(pendingValue)"
         errorLine2="                                 ~~~~~~~~~~">
@@ -2720,7 +2720,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="                        .setStatus(CurrentValue.Status.DISAMBIG)"
         errorLine2="                         ~~~~~~~~~">
@@ -2729,7 +2729,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.DISAMBIG can only be accessed from within the same library (:)"
         errorLine1="                        .setStatus(CurrentValue.Status.DISAMBIG)"
         errorLine2="                                                       ~~~~~~~~">
@@ -2738,7 +2738,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            AppGroundingResult.Kind.SUCCESS -> ground(pendingValue.value, taskParamBinding)"
         errorLine2="                                                                   ~~~~~">
@@ -2747,7 +2747,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CurrentValue.getValue can only be called from within the same library (:)"
         errorLine1="            AppGroundingResult.Kind.SUCCESS -> ground(pendingValue.value, taskParamBinding)"
         errorLine2="                                                                   ~~~~~">
@@ -2756,7 +2756,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DisambiguationData.getEntitiesList can only be called from within the same library (:)"
         errorLine1="        val entityIds = disambiguationData.entitiesList.map { it.identifier }"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -2765,7 +2765,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DisambiguationData.getEntitiesList can only be called from within the same library (:)"
         errorLine1="        val entityIds = disambiguationData.entitiesList.map { it.identifier }"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -2774,7 +2774,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="        val entityIds = disambiguationData.entitiesList.map { it.identifier }"
         errorLine2="                                                                 ~~~~~~~~~~">
@@ -2783,7 +2783,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.getIdentifier can only be called from within the same library (:)"
         errorLine1="        val entityIds = disambiguationData.entitiesList.map { it.identifier }"
         errorLine2="                                                                 ~~~~~~~~~~">
@@ -2792,7 +2792,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.ACCEPTED can only be accessed from within the same library (:)"
         errorLine1="                        CurrentValue.Status.ACCEPTED,"
         errorLine2="                                            ~~~~~~~~">
@@ -2801,7 +2801,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.REJECTED can only be accessed from within the same library (:)"
         errorLine1="                        CurrentValue.Status.REJECTED,"
         errorLine2="                                            ~~~~~~~~">
@@ -2810,7 +2810,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.REJECTED can only be accessed from within the same library (:)"
         errorLine1="                        CurrentValue.Status.REJECTED,"
         errorLine2="                                            ~~~~~~~~">
@@ -2819,7 +2819,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                    return ParamValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -2828,7 +2828,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                        .setStringValue(value.getTextValue())"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -2837,7 +2837,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                    String identifier = paramValue.getIdentifier();"
         errorLine2="                                                   ~~~~~~~~~~~~~">
@@ -2846,7 +2846,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.newBuilder can only be called from within the same library (:)"
         errorLine1="                    Entity.newBuilder()"
         errorLine2="                           ~~~~~~~~~~">
@@ -2855,7 +2855,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                            .setIdentifier(stringValue.getName())"
         errorLine2="                             ~~~~~~~~~~~~~">
@@ -2864,7 +2864,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="                            .setName(stringValue.getName())"
         errorLine2="                             ~~~~~~~">
@@ -2873,7 +2873,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllAlternateNames can only be called from within the same library (:)"
         errorLine1="                            .addAllAlternateNames(stringValue.getAlternateNames())"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2882,7 +2882,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                            Entity.newBuilder().setIdentifier(callFormat.getTextValue()).build();"
         errorLine2="                                                ~~~~~~~~~~~~~">
@@ -2891,7 +2891,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.newBuilder can only be called from within the same library (:)"
         errorLine1="                            Entity.newBuilder().setIdentifier(callFormat.getTextValue()).build();"
         errorLine2="                                   ~~~~~~~~~~">
@@ -2900,7 +2900,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                    if (supportedValue.toString().equals(paramValue.getIdentifier())) {"
         errorLine2="                                                                    ~~~~~~~~~~~~~">
@@ -2909,7 +2909,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.getIdentifier can only be called from within the same library (:)"
         errorLine1="                        + &quot;Value because identifier &quot; + paramValue.getIdentifier() + &quot; is not &quot;"
         errorLine2="                                                                   ~~~~~~~~~~~~~">
@@ -2918,7 +2918,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                        return ParamValue.newBuilder().setIdentifier(obj.toString()).build();"
         errorLine2="                                                       ~~~~~~~~~~~~~">
@@ -2927,7 +2927,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                        return ParamValue.newBuilder().setIdentifier(obj.toString()).build();"
         errorLine2="                                          ~~~~~~~~~~">
@@ -2936,7 +2936,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                        return Entity.newBuilder().setIdentifier(obj.toString()).build();"
         errorLine2="                                                   ~~~~~~~~~~~~~">
@@ -2945,7 +2945,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Entity.newBuilder can only be called from within the same library (:)"
         errorLine1="                        return Entity.newBuilder().setIdentifier(obj.toString()).build();"
         errorLine2="                                      ~~~~~~~~~~">
diff --git a/appactions/interaction/interaction-capabilities-productivity/lint-baseline.xml b/appactions/interaction/interaction-capabilities-productivity/lint-baseline.xml
index 1226f52..c799fa3 100644
--- a/appactions/interaction/interaction-capabilities-productivity/lint-baseline.xml
+++ b/appactions/interaction/interaction-capabilities-productivity/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                    .setStructValue("
         errorLine2="                     ~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                    .setStructValue("
         errorLine2="                     ~~~~~~~~~~~~~~">
diff --git a/appactions/interaction/interaction-capabilities-safety/lint-baseline.xml b/appactions/interaction/interaction-capabilities-safety/lint-baseline.xml
index 624cdec..aece2ed 100644
--- a/appactions/interaction/interaction-capabilities-safety/lint-baseline.xml
+++ b/appactions/interaction/interaction-capabilities-safety/lint-baseline.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="            return ParamValue.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="                .setStructValue("
         errorLine2="                 ~~~~~~~~~~~~~~">
diff --git a/appactions/interaction/interaction-capabilities-testing/lint-baseline.xml b/appactions/interaction/interaction-capabilities-testing/lint-baseline.xml
index 37a7a31..f0b1248 100644
--- a/appactions/interaction/interaction-capabilities-testing/lint-baseline.xml
+++ b/appactions/interaction/interaction-capabilities-testing/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.newBuilder can only be called from within the same library (:)"
         errorLine1="        val builder = Fulfillment.newBuilder()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="            val paramBuilder = FulfillmentParam.newBuilder().setName(key)"
         errorLine2="                                                             ~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.newBuilder can only be called from within the same library (:)"
         errorLine1="            val paramBuilder = FulfillmentParam.newBuilder().setName(key)"
         errorLine2="                                                ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addParams can only be called from within the same library (:)"
         errorLine1="                builder.addParams("
         errorLine2="                        ~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addFulfillmentValues can only be called from within the same library (:)"
         errorLine1="                    paramBuilder.addFulfillmentValues("
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="                        FulfillmentValue.newBuilder().setValue(value).build()"
         errorLine2="                                                      ~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                        FulfillmentValue.newBuilder().setValue(value).build()"
         errorLine2="                                         ~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setNumberValue(argVal.toDouble()).build()"
         errorLine2="                                               ~~~~~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setNumberValue(argVal.toDouble()).build()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setNumberValue can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setNumberValue(argVal).build()"
         errorLine2="                                               ~~~~~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setNumberValue(argVal).build()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringValue can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setStringValue(argVal).build()"
         errorLine2="                                               ~~~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setStringValue(argVal).build()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setIdentifier(argVal.toString()).build()"
         errorLine2="                                               ~~~~~~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                return ParamValue.newBuilder().setIdentifier(argVal.toString()).build()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue can only be accessed from within the same library (:)"
         errorLine1="            is ParamValue -> {"
         errorLine2="               ~~~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParamValue.newBuilder can only be called from within the same library (:)"
         errorLine1="        return ParamValue.newBuilder()"
         errorLine2="                          ~~~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStructValue can only be called from within the same library (:)"
         errorLine1="            .setStructValue("
         errorLine2="             ~~~~~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.SLOTS_COMPLETE can only be accessed from within the same library (:)"
         errorLine1="        return buildRequestArgs(type, Fulfillment.SyncStatus.SLOTS_COMPLETE, *args)"
         errorLine2="                                                             ~~~~~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllParams can only be called from within the same library (:)"
         errorLine1="        val builder = Fulfillment.newBuilder().addAllParams(buildFulfillmentParams(*args))"
         errorLine2="                                               ~~~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.newBuilder can only be called from within the same library (:)"
         errorLine1="        val builder = Fulfillment.newBuilder().addAllParams(buildFulfillmentParams(*args))"
         errorLine2="                                  ~~~~~~~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.UNRECOGNIZED can only be accessed from within the same library (:)"
         errorLine1="        if (type != Fulfillment.Type.UNRECOGNIZED) {"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setType can only be called from within the same library (:)"
         errorLine1="            builder.type = type"
         errorLine2="                    ~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setType can only be called from within the same library (:)"
         errorLine1="            builder.type = type"
         errorLine2="                    ~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Type.SYNC can only be accessed from within the same library (:)"
         errorLine1="            if (type == Fulfillment.Type.SYNC &amp;&amp;"
         errorLine2="                                         ~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SyncStatus.UNRECOGNIZED can only be accessed from within the same library (:)"
         errorLine1="                syncStatus != Fulfillment.SyncStatus.UNRECOGNIZED) {"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSyncStatus can only be called from within the same library (:)"
         errorLine1="                builder.syncStatus = syncStatus"
         errorLine2="                        ~~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSyncStatus can only be called from within the same library (:)"
         errorLine1="                builder.syncStatus = syncStatus"
         errorLine2="                        ~~~~~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="            val paramBuilder = FulfillmentParam.newBuilder().setName(key)"
         errorLine2="                                                             ~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.newBuilder can only be called from within the same library (:)"
         errorLine1="            val paramBuilder = FulfillmentParam.newBuilder().setName(key)"
         errorLine2="                                                ~~~~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addFulfillmentValues can only be called from within the same library (:)"
         errorLine1="                    paramBuilder.addFulfillmentValues("
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="                        FulfillmentValue.newBuilder().setValue(value).build()"
         errorLine2="                                                      ~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="                        FulfillmentValue.newBuilder().setValue(value).build()"
         errorLine2="                                         ~~~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.getFulfillments can only be called from within the same library (:)"
         errorLine1="    val fulfillment = fulfillmentRequest.getFulfillments(0)"
         errorLine2="                                         ~~~~~~~~~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addFulfillments can only be called from within the same library (:)"
         errorLine1="      FulfillmentRequest.newBuilder().addFulfillments("
         errorLine2="                                      ~~~~~~~~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.newBuilder can only be called from within the same library (:)"
         errorLine1="      FulfillmentRequest.newBuilder().addFulfillments("
         errorLine2="                         ~~~~~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIdentifier can only be called from within the same library (:)"
         errorLine1="        fulfillment.toBuilder().setIdentifier(capabilityIdentifier).build()"
         errorLine2="                                ~~~~~~~~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllFulfillmentValues can only be called from within the same library (:)"
         errorLine1="      FulfillmentParam.newBuilder().setName(slotName).addAllFulfillmentValues("
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="      FulfillmentParam.newBuilder().setName(slotName).addAllFulfillmentValues("
         errorLine2="                                    ~~~~~~~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentParam.newBuilder can only be called from within the same library (:)"
         errorLine1="      FulfillmentParam.newBuilder().setName(slotName).addAllFulfillmentValues("
         errorLine2="                       ~~~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library (:)"
         errorLine1="        paramValues.map { FulfillmentValue.newBuilder().setValue(it).build() }"
         errorLine2="                                                        ~~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentValue.newBuilder can only be called from within the same library (:)"
         errorLine1="        paramValues.map { FulfillmentValue.newBuilder().setValue(it).build() }"
         errorLine2="                                           ~~~~~~~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addFulfillments can only be called from within the same library (:)"
         errorLine1="      FulfillmentRequest.newBuilder().addFulfillments("
         errorLine2="                                      ~~~~~~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.newBuilder can only be called from within the same library (:)"
         errorLine1="      FulfillmentRequest.newBuilder().addFulfillments("
         errorLine2="                         ~~~~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.newBuilder can only be called from within the same library (:)"
         errorLine1="        Fulfillment.newBuilder()"
         errorLine2="                    ~~~~~~~~~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library (:)"
         errorLine1="          .setName(actionSpec.capabilityName)"
         errorLine2="           ~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllParams can only be called from within the same library (:)"
         errorLine1="          .addAllParams(fulfillmentParams)"
         errorLine2="           ~~~~~~~~~~~~">
diff --git a/appactions/interaction/interaction-service/lint-baseline.xml b/appactions/interaction/interaction-service/lint-baseline.xml
index e3a7e0c..8cb93a1 100644
--- a/appactions/interaction/interaction-service/lint-baseline.xml
+++ b/appactions/interaction/interaction-service/lint-baseline.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionMetadata.parseFrom can only be called from within the same library (:)"
         errorLine1="                    AppInteractionMetadata.parseFrom(serialized)"
         errorLine2="                                           ~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.UNKNOWN_ERROR_STATUS can only be accessed from within the same library (:)"
         errorLine1="            -> ErrorStatus.UNKNOWN_ERROR_STATUS"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.INTERNAL can only be accessed from within the same library (:)"
         errorLine1="            ErrorStatusInternal.INTERNAL -> ErrorStatus.INTERNAL"
         errorLine2="                                                        ~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.CANCELED can only be accessed from within the same library (:)"
         errorLine1="            ErrorStatusInternal.CANCELED -> ErrorStatus.CANCELED"
         errorLine2="                                                        ~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.TIMEOUT can only be accessed from within the same library (:)"
         errorLine1="            ErrorStatusInternal.TIMEOUT -> ErrorStatus.TIMEOUT"
         errorLine2="                                                       ~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.INVALID_REQUEST can only be accessed from within the same library (:)"
         errorLine1="            ErrorStatusInternal.INVALID_REQUEST -> ErrorStatus.INVALID_REQUEST"
         errorLine2="                                                               ~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.SESSION_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="            -> ErrorStatus.SESSION_NOT_FOUND"
         errorLine2="                           ~~~~~~~~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.EXTERNAL_EXCEPTION can only be accessed from within the same library (:)"
         errorLine1="            ErrorStatusInternal.EXTERNAL_EXCEPTION -> ErrorStatus.EXTERNAL_EXCEPTION"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionMetadata.newBuilder can only be called from within the same library (:)"
         errorLine1="        return AppInteractionMetadata.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setErrorStatus can only be called from within the same library (:)"
         errorLine1="            .setErrorStatus(errorStatus)"
         errorLine2="             ~~~~~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionMetadata.newBuilder can only be called from within the same library (:)"
         errorLine1="            AppInteractionMetadata.newBuilder()"
         errorLine2="                                   ~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setErrorStatus can only be called from within the same library (:)"
         errorLine1="                .setErrorStatus(errorStatus)"
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceGrpc.SERVICE_NAME can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .servicePolicy(AppInteractionServiceGrpc.SERVICE_NAME, securityPolicy)"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1=") : AppInteractionServiceImplBase() {"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase.startUpSession can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="    override fun startUpSession("
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            val sessionId = request.sessionIdentifier!!"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            val sessionId = request.sessionIdentifier!!"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                registeredCapabilities.firstOrNull { request.identifier == it.id }"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                registeredCapabilities.firstOrNull { request.identifier == it.id }"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.CAPABILITY_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                        AppInteractionGrpcMetadata.metadataOf(ErrorStatus.CAPABILITY_NOT_FOUND)"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HostProperties.getHostViewHeightDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewHeightDp,"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HostProperties.getHostViewHeightDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewHeightDp,"
         errorLine2="                                               ~~~~~~~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getHostProperties can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewHeightDp,"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getHostProperties can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewHeightDp,"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HostProperties.getHostViewWidthDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewWidthDp,"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HostProperties.getHostViewWidthDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewWidthDp,"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getHostProperties can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewWidthDp,"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionRequest.getHostProperties can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        request.hostProperties.hostViewWidthDp,"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StartSessionResponse.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            startSessionResponseObserver.onNext(StartSessionResponse.getDefaultInstance())"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase.sendRequestFulfillment can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="    override fun sendRequestFulfillment("
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.getFulfillmentsList can only be called from within the same library (:)"
         errorLine1="        if (request.fulfillmentRequest.fulfillmentsList.isEmpty()) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.getFulfillmentsList can only be called from within the same library (:)"
         errorLine1="        if (request.fulfillmentRequest.fulfillmentsList.isEmpty()) {"
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getFulfillmentRequest can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        if (request.fulfillmentRequest.fulfillmentsList.isEmpty()) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getFulfillmentRequest can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        if (request.fulfillmentRequest.fulfillmentsList.isEmpty()) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.INVALID_REQUEST can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.INVALID_REQUEST)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FulfillmentRequest.getFulfillments can only be called from within the same library (:)"
         errorLine1="        val selectedFulfillment = request.fulfillmentRequest.getFulfillments(0)"
         errorLine2="                                                             ~~~~~~~~~~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getFulfillmentRequest can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val selectedFulfillment = request.fulfillmentRequest.getFulfillments(0)"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getFulfillmentRequest can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val selectedFulfillment = request.fulfillmentRequest.getFulfillments(0)"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getIdentifier can only be called from within the same library (:)"
         errorLine1="            registeredCapabilities.firstOrNull { selectedFulfillment.identifier == it.id }"
         errorLine2="                                                                     ~~~~~~~~~~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fulfillment.getIdentifier can only be called from within the same library (:)"
         errorLine1="            registeredCapabilities.firstOrNull { selectedFulfillment.identifier == it.id }"
         errorLine2="                                                                     ~~~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.CAPABILITY_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.CAPABILITY_NOT_FOUND)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = request.sessionIdentifier!!"
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = request.sessionIdentifier!!"
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.SESSION_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.SESSION_NOT_FOUND)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.SESSION_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.SESSION_NOT_FOUND)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUiUpdate can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        responseBuilder.uiUpdate = UiUpdate.getDefaultInstance()"
         errorLine2="                                        ~~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUiUpdate can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        responseBuilder.uiUpdate = UiUpdate.getDefaultInstance()"
         errorLine2="                                        ~~~~~~~~">
@@ -425,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiUpdate.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        responseBuilder.uiUpdate = UiUpdate.getDefaultInstance()"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
@@ -434,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiUpdate.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        responseBuilder.uiUpdate = UiUpdate.getDefaultInstance()"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
@@ -443,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCollectionUpdate can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                            responseBuilder.setCollectionUpdate("
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
@@ -452,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionUpdate.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                                AppInteractionServiceProto.CollectionUpdate.newBuilder()"
         errorLine2="                                                                            ~~~~~~~~~~">
@@ -461,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllViewIds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                                    .addAllViewIds("
         errorLine2="                                     ~~~~~~~~~~~~~">
@@ -470,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.UNKNOWN_ERROR_STATUS can only be accessed from within the same library (:)"
         errorLine1="                                    ErrorStatus.UNKNOWN_ERROR_STATUS)"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~">
@@ -479,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase.requestUi can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="    override fun requestUi("
         errorLine2="                 ~~~~~~~~~">
@@ -488,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = req.sessionIdentifier!!"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -497,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = req.sessionIdentifier!!"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -506,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.SESSION_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.SESSION_NOT_FOUND)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~">
@@ -515,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.NO_UI_ELEMENTS can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.NO_UI_ELEMENTS)),"
         errorLine2="                                                                      ~~~~~~~~~~~~~~">
@@ -524,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.NO_UI_ELEMENTS can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.NO_UI_ELEMENTS)),"
         errorLine2="                                                                      ~~~~~~~~~~~~~~">
@@ -533,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val uiResponseBuilder = AppInteractionServiceProto.UiResponse.newBuilder()"
         errorLine2="                                                                      ~~~~~~~~~~">
@@ -542,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTileLayout can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        tileLayoutInternal?.let { uiResponseBuilder.tileLayout = it.toProto() }"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -551,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTileLayout can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        tileLayoutInternal?.let { uiResponseBuilder.tileLayout = it.toProto() }"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -560,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRemoteViewsInfo can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setRemoteViewsInfo("
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -569,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RemoteViewsInfo.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    RemoteViewsInfo.newBuilder()"
         errorLine2="                                    ~~~~~~~~~~">
@@ -578,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidthDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setWidthDp(remoteViewsInternal.size.width)"
         errorLine2="                         ~~~~~~~~~~">
@@ -587,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeightDp can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setHeightDp(remoteViewsInternal.size.height)"
         errorLine2="                         ~~~~~~~~~~~">
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase.requestCollection can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="    override fun requestCollection("
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = req.sessionIdentifier!!"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getSessionIdentifier can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val sessionId = req.sessionIdentifier!!"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.SESSION_NOT_FOUND can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.SESSION_NOT_FOUND)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.NO_UI_ELEMENTS can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.NO_UI_ELEMENTS)"
         errorLine2="                                                                      ~~~~~~~~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getViewId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val factory = uiCache.cachedRemoteViewsInternal?.collectionViewFactories?.get(req.viewId)"
         errorLine2="                                                                                          ~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getViewId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        val factory = uiCache.cachedRemoteViewsInternal?.collectionViewFactories?.get(req.viewId)"
         errorLine2="                                                                                          ~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.UNKNOWN_ERROR_STATUS can only be accessed from within the same library (:)"
         errorLine1="                    AppInteractionGrpcMetadata.metadataOf(ErrorStatus.UNKNOWN_ERROR_STATUS),"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getRequestDataCase can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        when (req.requestDataCase) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getRequestDataCase can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        when (req.requestDataCase) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.ON_DESTROY can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.ON_DESTROY -> {"
         errorLine2="                            ~~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.GET_COUNT can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.GET_COUNT -> {"
         errorLine2="                            ~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.GET_VIEW_AT can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.GET_VIEW_AT -> {"
         errorLine2="                            ~~~~~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getGetViewAt can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getViewAt.position,"
         errorLine2="                        ~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getGetViewAt can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getViewAt.position,"
         errorLine2="                        ~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetViewAt.getPosition can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getViewAt.position,"
         errorLine2="                                  ~~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetViewAt.getPosition can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getViewAt.position,"
         errorLine2="                                  ~~~~~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.GET_LOADING_VIEW can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.GET_LOADING_VIEW -> {"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.GET_VIEW_TYPE_COUNT can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.GET_VIEW_TYPE_COUNT -> {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.GET_ITEM_ID can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.GET_ITEM_ID -> {"
         errorLine2="                            ~~~~~~~~~~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getGetItemId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getItemId.position,"
         errorLine2="                        ~~~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionRequest.getGetItemId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getItemId.position,"
         errorLine2="                        ~~~~~~~~~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetItemId.getPosition can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getItemId.position,"
         errorLine2="                                  ~~~~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetItemId.getPosition can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    req.getItemId.position,"
         errorLine2="                                  ~~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestDataCase.HAS_STABLE_IDS can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            RequestDataCase.HAS_STABLE_IDS -> {"
         errorLine2="                            ~~~~~~~~~~~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppInteractionServiceImplBase.requestGrounding can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="    override fun requestGrounding("
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="            it.id == request.request.entityProviderId"
         errorLine2="                             ~~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingRequest.getRequest can only be called from within the same library (:)"
         errorLine1="            it.id == request.request.entityProviderId"
         errorLine2="                             ~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getEntityProviderId can only be called from within the same library (:)"
         errorLine1="            it.id == request.request.entityProviderId"
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Request.getEntityProviderId can only be called from within the same library (:)"
         errorLine1="            it.id == request.request.entityProviderId"
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GroundingResponse.newBuilder can only be called from within the same library (:)"
         errorLine1="                GroundingResponse.newBuilder()"
         errorLine2="                                  ~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResponse can only be called from within the same library (:)"
         errorLine1="                    .setResponse("
         errorLine2="                     ~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatus can only be called from within the same library (:)"
         errorLine1="                        GroundingResponse.Response.newBuilder().setStatus("
         errorLine2="                                                                ~~~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Response.newBuilder can only be called from within the same library (:)"
         errorLine1="                        GroundingResponse.Response.newBuilder().setStatus("
         errorLine2="                                                   ~~~~~~~~~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.INVALID_ENTITY_PROVIDER can only be accessed from within the same library (:)"
         errorLine1="                            GroundingResponse.Status.INVALID_ENTITY_PROVIDER,"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.UNKNOWN_ERROR_STATUS can only be accessed from within the same library (:)"
         errorLine1="                            AppInteractionGrpcMetadata.metadataOf(ErrorStatus.UNKNOWN_ERROR_STATUS)"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        respondAndComplete(CollectionResponse.getDefaultInstance(), observer)"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            CollectionResponse.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setGetCount can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setGetCount("
         errorLine2="                 ~~~~~~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetCount.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    CollectionResponse.GetCount.newBuilder()"
         errorLine2="                                                ~~~~~~~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCount can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setCount(factory.count),"
         errorLine2="                         ~~~~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        respondAndComplete(CollectionResponse.getDefaultInstance(), observer)"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.getDefaultInstance can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        respondAndComplete(CollectionResponse.getDefaultInstance(), observer)"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            CollectionResponse.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setGetViewTypeCount can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setGetViewTypeCount("
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetViewTypeCount.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    CollectionResponse.GetViewTypeCount.newBuilder()"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setViewTypeCount can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setViewTypeCount(factory.viewTypeCount),"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            CollectionResponse.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setGetItemId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setGetItemId("
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetItemId.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    CollectionResponse.GetItemId.newBuilder()"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setItemId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setItemId(factory.getItemId(position)),"
         errorLine2="                         ~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CollectionResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            CollectionResponse.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHasStableIds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setHasStableIds("
         errorLine2="                 ~~~~~~~~~~~~~~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HasStableIds.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                    CollectionResponse.HasStableIds.newBuilder()"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHasStableIds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                        .setHasStableIds(factory.hasStableIds()),"
         errorLine2="                         ~~~~~~~~~~~~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Version.newBuilder can only be called from within the same library (:)"
         errorLine1="        val builder = Version.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMajor can only be called from within the same library (:)"
         errorLine1="            .setMajor(libInfoVersion.major.toLong())"
         errorLine2="             ~~~~~~~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMinor can only be called from within the same library (:)"
         errorLine1="            .setMinor(libInfoVersion.minor.toLong())"
         errorLine2="             ~~~~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPatch can only be called from within the same library (:)"
         errorLine1="            .setPatch(libInfoVersion.patch.toLong())"
         errorLine2="             ~~~~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPrereleaseId can only be called from within the same library (:)"
         errorLine1="        libInfoVersion.preReleaseId?.let(builder::setPrereleaseId)"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getTaskInfo can only be called from within the same library (:)"
         errorLine1="        val isDialogSession = appAction.taskInfo.supportsPartialFulfillment"
         errorLine2="                                        ~~~~~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppAction.getTaskInfo can only be called from within the same library (:)"
         errorLine1="        val isDialogSession = appAction.taskInfo.supportsPartialFulfillment"
         errorLine2="                                        ~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TaskInfo.getSupportsPartialFulfillment can only be called from within the same library (:)"
         errorLine1="        val isDialogSession = appAction.taskInfo.supportsPartialFulfillment"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TaskInfo.getSupportsPartialFulfillment can only be called from within the same library (:)"
         errorLine1="        val isDialogSession = appAction.taskInfo.supportsPartialFulfillment"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AppActionsContext.newBuilder can only be called from within the same library (:)"
         errorLine1="        val appActionsContextBuilder = AppActionsContext.newBuilder()"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -1181,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addActions can only be called from within the same library (:)"
         errorLine1="            .addActions(appAction)"
         errorLine2="             ~~~~~~~~~~">
@@ -1190,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVersion can only be called from within the same library (:)"
         errorLine1="            .setVersion(version)"
         errorLine2="             ~~~~~~~~~~">
@@ -1199,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addDialogStates can only be called from within the same library (:)"
         errorLine1="        currentSession.state?.let(appActionsContextBuilder::addDialogStates)"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1208,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Response.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            Response.newBuilder()"
         errorLine2="                     ~~~~~~~~~~">
@@ -1217,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFulfillmentResponse can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setFulfillmentResponse(fulfillmentResponse)"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -1226,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAppActionsContext can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setAppActionsContext(appActionsContextBuilder.build())"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -1235,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndingStatus can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            responseBuilder.endingStatus = AppInteractionServiceProto.Status.newBuilder()"
         errorLine2="                            ~~~~~~~~~~~~">
@@ -1244,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndingStatus can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            responseBuilder.endingStatus = AppInteractionServiceProto.Status.newBuilder()"
         errorLine2="                            ~~~~~~~~~~~~">
@@ -1253,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            responseBuilder.endingStatus = AppInteractionServiceProto.Status.newBuilder()"
         errorLine2="                                                                             ~~~~~~~~~~">
@@ -1262,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Status.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            responseBuilder.endingStatus = AppInteractionServiceProto.Status.newBuilder()"
         errorLine2="                                                                             ~~~~~~~~~~">
@@ -1271,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatusCode can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setStatusCode(Code.COMPLETE)"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -1280,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStatusCode can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setStatusCode(Code.COMPLETE)"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -1289,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Code.COMPLETE can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setStatusCode(Code.COMPLETE)"
         errorLine2="                                    ~~~~~~~~">
@@ -1298,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Code.COMPLETE can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="                .setStatusCode(Code.COMPLETE)"
         errorLine2="                                    ~~~~~~~~">
@@ -1307,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TileLayout.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="        return AppInteractionServiceProto.TileLayout.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1316,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLayout can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.appactions.interaction`)"
         errorLine1="            .setLayout(ByteString.copyFrom(byteArray))"
         errorLine2="             ~~~~~~~~~">
diff --git a/camera/camera-core/lint-baseline.xml b/camera/camera-core/lint-baseline.xml
index 771996c..70dac88 100644
--- a/camera/camera-core/lint-baseline.xml
+++ b/camera/camera-core/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExifInterface.TAG_THUMBNAIL_ORIENTATION can only be accessed from within the same library (androidx.exifinterface:exifinterface)"
         errorLine1="            ExifInterface.TAG_THUMBNAIL_ORIENTATION);"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExifInterface.TAG_THUMBNAIL_ORIENTATION can only be accessed from within the same library (androidx.exifinterface:exifinterface)"
         errorLine1="                ExifInterface.TAG_THUMBNAIL_ORIENTATION,"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/camera/integration-tests/avsynctestapp/lint-baseline.xml b/camera/integration-tests/avsynctestapp/lint-baseline.xml
index f784698..2f3251e 100644
--- a/camera/integration-tests/avsynctestapp/lint-baseline.xml
+++ b/camera/integration-tests/avsynctestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not start audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                   ~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not start audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                     ~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not start audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;start audio generation&quot;)"
         errorLine2="               ~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;start audio generation&quot;)"
         errorLine2="                 ~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;start audio generation&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not stop audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                   ~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not stop audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                     ~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not stop audio generation, since AudioGenerator is disabled.&quot;)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;stop audio generation&quot;)"
         errorLine2="               ~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;stop audio generation&quot;)"
         errorLine2="                 ~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;stop audio generation&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playState before stopped: ${audioTrack!!.playState}&quot;)"
         errorLine2="               ~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playState before stopped: ${audioTrack!!.playState}&quot;)"
         errorLine2="                 ~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playState before stopped: ${audioTrack!!.playState}&quot;)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playbackHeadPosition before stopped: ${audioTrack!!.playbackHeadPosition}&quot;)"
         errorLine2="               ~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playbackHeadPosition before stopped: ${audioTrack!!.playbackHeadPosition}&quot;)"
         errorLine2="                 ~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;playbackHeadPosition before stopped: ${audioTrack!!.playbackHeadPosition}&quot;)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -164,43 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgumentNonnegative can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        checkArgumentNonnegative(frequency, &quot;The input frequency should not be negative.&quot;)"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgumentNonnegative can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        checkArgumentNonnegative(frequency, &quot;The input frequency should not be negative.&quot;)"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        checkArgument(beepLengthInSec >= 0, &quot;The beep length should not be negative.&quot;)"
-        errorLine2="        ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        checkArgument(beepLengthInSec >= 0, &quot;The beep length should not be negative.&quot;)"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/model/AudioGenerator.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not initial audio track, since AudioGenerator is disabled.&quot;)"
         errorLine2="                   ~">
@@ -209,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not initial audio track, since AudioGenerator is disabled.&quot;)"
         errorLine2="                     ~~~">
@@ -218,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.i(TAG, &quot;Will not initial audio track, since AudioGenerator is disabled.&quot;)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -227,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with sample rate: $sampleRate&quot;)"
         errorLine2="               ~">
@@ -236,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with sample rate: $sampleRate&quot;)"
         errorLine2="                 ~~~">
@@ -245,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with sample rate: $sampleRate&quot;)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -254,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with beep frequency: $frequency&quot;)"
         errorLine2="               ~">
@@ -263,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with beep frequency: $frequency&quot;)"
         errorLine2="                 ~~~">
@@ -272,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with beep frequency: $frequency&quot;)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -281,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with buffer size: $bufferSize&quot;)"
         errorLine2="               ~">
@@ -290,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with buffer size: $bufferSize&quot;)"
         errorLine2="                 ~~~">
@@ -299,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.i can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.i(TAG, &quot;initAudioTrack with buffer size: $bufferSize&quot;)"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -308,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Camera binding failed&quot;, exception)"
         errorLine2="                   ~">
@@ -317,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Camera binding failed&quot;, exception)"
         errorLine2="                     ~~~">
@@ -326,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Camera binding failed&quot;, exception)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~">
@@ -335,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Camera binding failed&quot;, exception)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -344,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceQuirks.get can only be called from within the same library (androidx.camera:camera-video)"
         errorLine1="        return DeviceQuirks.get(MediaStoreVideoCannotWrite::class.java) == null"
         errorLine2="                            ~~~">
@@ -353,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceQuirks.get can only be called from within the same library (androidx.camera:camera-video)"
         errorLine1="        return DeviceQuirks.get(MediaStoreVideoCannotWrite::class.java) == null"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -362,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to create directory: $videoFolder&quot;)"
         errorLine2="                   ~">
@@ -371,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to create directory: $videoFolder&quot;)"
         errorLine2="                     ~~~">
@@ -380,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to create directory: $videoFolder&quot;)"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -389,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
         errorLine2="                           ~">
@@ -398,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
         errorLine2="                             ~~~">
@@ -407,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.d(TAG, &quot;Video saved to: $uri&quot;)"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~">
@@ -416,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.e(TAG, &quot;Failed to save video: $msg&quot;)"
         errorLine2="                           ~">
@@ -425,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.e(TAG, &quot;Failed to save video: $msg&quot;)"
         errorLine2="                             ~~~">
@@ -434,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Logger.e(TAG, &quot;Failed to save video: $msg&quot;)"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -443,25 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkArgument(brightness in MIN_SCREEN_BRIGHTNESS..MAX_SCREEN_BRIGHTNESS)"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/MainActivity.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkArgument(percentage in 0.0..1.0)"
-        errorLine2="                      ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start signal generation.&quot;)"
         errorLine2="               ~">
@@ -470,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start signal generation.&quot;)"
         errorLine2="                 ~~~">
@@ -479,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start signal generation.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -488,16 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isGeneratorReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop signal generation.&quot;)"
         errorLine2="               ~">
@@ -506,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop signal generation.&quot;)"
         errorLine2="                 ~~~">
@@ -515,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop signal generation.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -524,16 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isGeneratorReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start recording.&quot;)"
         errorLine2="               ~">
@@ -542,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start recording.&quot;)"
         errorLine2="                 ~~~">
@@ -551,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Start recording.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
@@ -560,16 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isRecorderReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop recording.&quot;)"
         errorLine2="               ~">
@@ -578,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop recording.&quot;)"
         errorLine2="                 ~~~">
@@ -587,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Stop recording.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~">
@@ -596,16 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isRecorderReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Pause recording.&quot;)"
         errorLine2="               ~">
@@ -614,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Pause recording.&quot;)"
         errorLine2="                 ~~~">
@@ -623,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Pause recording.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
@@ -632,16 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isRecorderReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Resume recording.&quot;)"
         errorLine2="               ~">
@@ -650,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Resume recording.&quot;)"
         errorLine2="                 ~~~">
@@ -659,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Logger.d(TAG, &quot;Resume recording.&quot;)"
         errorLine2="                       ~~~~~~~~~~~~~~~~~">
@@ -667,13 +568,4 @@
             file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
     </issue>
 
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(isRecorderReady)"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/avsync/SignalGeneratorViewModel.kt"/>
-    </issue>
-
 </issues>
diff --git a/camera/integration-tests/camerapipetestapp/lint-baseline.xml b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
index bb49d47..80b96ac 100644
--- a/camera/integration-tests/camerapipetestapp/lint-baseline.xml
+++ b/camera/integration-tests/camerapipetestapp/lint-baseline.xml
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getNORMAL can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="    private var operatingMode: CameraGraph.OperatingMode = CameraGraph.OperatingMode.NORMAL"
         errorLine2="                                                                                     ~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.cameras can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        val cameraDevices = cameraPipe.cameras()"
         errorLine2="                                       ~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraIds-SeavPBo can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraIdGroups = cameraDevices.awaitCameraIds()!!.map { listOf(it) } +"
         errorLine2="                                       ~~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitConcurrentCameraIds-SeavPBo can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraDevices.awaitConcurrentCameraIds()!!.filter { it.size &lt;= 2 }.map { it.toList() }"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getNORMAL can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (lastCameraIdGroup.size == 1 &amp;&amp; operatingMode == CameraGraph.OperatingMode.NORMAL) {"
         errorLine2="                                                                                      ~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getHIGH_SPEED can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            operatingMode = CameraGraph.OperatingMode.HIGH_SPEED"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getNORMAL can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        operatingMode = CameraGraph.OperatingMode.NORMAL"
         errorLine2="                                                  ~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            result = CameraPipe(CameraPipe.Config(appContext = this))"
         errorLine2="                     ~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            result = CameraPipe(CameraPipe.Config(appContext = this))"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Config can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            result = CameraPipe(CameraPipe.Config(appContext = this))"
         errorLine2="                                           ~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Config can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            result = CameraPipe(CameraPipe.Config(appContext = this))"
         errorLine2="                                                               ~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getNORMAL can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            operatingMode: CameraGraph.OperatingMode? = CameraGraph.OperatingMode.NORMAL"
         errorLine2="                                                                                  ~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getHIGH_SPEED can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            if (operatingMode == CameraGraph.OperatingMode.HIGH_SPEED) {"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                                          ~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.cameras can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                            ~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                              ~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                              ~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStreamConfig = Config.create("
         errorLine2="                                                ~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvSize,"
         errorLine2="                ~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getUNKNOWN-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                StreamFormat.UNKNOWN,"
         errorLine2="                             ~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getSURFACE_VIEW can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val privateStreamConfig = Config.create("
         errorLine2="                                             ~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                privateOutputSize,"
         errorLine2="                ~~~~~~~~~~~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getPRIVATE-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                StreamFormat.PRIVATE,"
         errorLine2="                             ~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW,"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getSURFACE_VIEW can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW,"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                streamUseCase = OutputStream.StreamUseCase.PREVIEW"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getPREVIEW-vrKr8v8 can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                streamUseCase = OutputStream.StreamUseCase.PREVIEW"
         errorLine2="                                                           ~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getHIGH_SPEED can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                sessionMode = CameraGraph.OperatingMode.HIGH_SPEED,"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.create can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraph = cameraPipe.create(config)"
         errorLine2="                                         ~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.create can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraph = cameraPipe.create(config)"
         errorLine2="                                                ~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.getStreams can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                               ~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                                      ~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.outputs can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderOutput = viewfinderStream.outputs.single()"
         errorLine2="                                                    ~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                viewfinderOutput.size,"
         errorLine2="                                 ~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                    ~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                                                    ~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                                                ~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.getStreams can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val privateStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                            ~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val privateStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                                   ~">
@@ -425,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val privateStream = cameraGraph.streams[privateStreamConfig]!!"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -434,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.outputs can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val privateOutput = privateStream.outputs.single()"
         errorLine2="                                              ~~~~~~~">
@@ -443,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.size.width,"
         errorLine2="                                  ~~~~">
@@ -452,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.size.height,"
         errorLine2="                                  ~~~~">
@@ -461,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getFormat-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.format.value,"
         errorLine2="                                  ~~~~~~">
@@ -470,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.size.width,"
         errorLine2="                                  ~~~~">
@@ -479,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.size.height,"
         errorLine2="                                  ~~~~">
@@ -488,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getFormat-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    privateOutput.format.value,"
         errorLine2="                                  ~~~~~~">
@@ -497,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(privateStream.id, imageReader.surface)"
         errorLine2="                        ~~~~~~~~~~">
@@ -506,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(privateStream.id, imageReader.surface)"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -515,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(privateStream.id, imageReader.surface)"
         errorLine2="                                                 ~~">
@@ -524,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.acquireSessionOrNull can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.acquireSessionOrNull()!!.use {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
@@ -533,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                it.startRepeating("
         errorLine2="                   ~~~~~~~~~~~~~~">
@@ -542,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Request("
         errorLine2="                    ~~~~~~~">
@@ -551,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        streams = listOf(viewfinderStream.id, privateStream.id)"
         errorLine2="                                                          ~~">
@@ -560,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        streams = listOf(viewfinderStream.id, privateStream.id)"
         errorLine2="                                                                            ~~">
@@ -569,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~">
@@ -578,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                                          ~~~~~~~~">
@@ -587,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.cameras can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                            ~~~~~~~">
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                              ~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraMetadata.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraMetadata[CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP]!!"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStreamConfig = Config.create("
         errorLine2="                                                ~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvSize,"
         errorLine2="                ~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getUNKNOWN-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                StreamFormat.UNKNOWN,"
         errorLine2="                             ~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getSURFACE_VIEW can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                outputType = OutputStream.OutputType.SURFACE_VIEW"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val yuvStreamConfig = Config.create("
         errorLine2="                                         ~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvSize,"
         errorLine2="                ~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getYUV_420_888-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                StreamFormat.YUV_420_888"
         errorLine2="                             ~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.create can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraph = cameraPipe.create(config)"
         errorLine2="                                         ~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.create can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraph = cameraPipe.create(config)"
         errorLine2="                                                ~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.getStreams can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                               ~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                                      ~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderStream = cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.outputs can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderOutput = viewfinderStream.outputs.single()"
         errorLine2="                                                    ~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                viewfinderOutput.size,"
         errorLine2="                                 ~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                    ~~~~~~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                                                    ~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        cameraGraph.setSurface(viewfinderStream.id, surface)"
         errorLine2="                                                                ~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.getStreams can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val yuvStream = cameraGraph.streams[yuvStreamConfig]!!"
         errorLine2="                                        ~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val yuvStream = cameraGraph.streams[yuvStreamConfig]!!"
         errorLine2="                                               ~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val yuvStream = cameraGraph.streams[yuvStreamConfig]!!"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.outputs can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val yuvOutput = yuvStream.outputs.single()"
         errorLine2="                                      ~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvOutput.size.width,"
         errorLine2="                          ~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvOutput.size.height,"
         errorLine2="                          ~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getFormat-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                yuvOutput.format.value,"
         errorLine2="                          ~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(yuvStream.id, imageReader.surface)"
         errorLine2="                        ~~~~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(yuvStream.id, imageReader.surface)"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.setSurface(yuvStream.id, imageReader.surface)"
         errorLine2="                                             ~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.acquireSessionOrNull can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            cameraGraph.acquireSessionOrNull()!!.use {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                it.startRepeating("
         errorLine2="                   ~~~~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Request("
         errorLine2="                    ~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        streams = listOf(viewfinderStream.id, yuvStream.id)"
         errorLine2="                                                          ~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        streams = listOf(viewfinderStream.id, yuvStream.id)"
         errorLine2="                                                                        ~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraDevices.awaitCameraMetadata-FpsL5FU can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                                              ~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.cameras can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                val cameraMetadata = cameraPipe.cameras().awaitCameraMetadata(cameraId)"
         errorLine2="                                                ~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                Config.create("
         errorLine2="                       ~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    size,"
         errorLine2="                    ~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getPRIVATE-8FPWQzE can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    StreamFormat.PRIVATE,"
         errorLine2="                                 ~~~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.create-bSQo6-Q can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    outputType = OutputStream.OutputType.SURFACE_VIEW,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Companion.getSURFACE_VIEW can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    outputType = OutputStream.OutputType.SURFACE_VIEW,"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.createCameraGraphs can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraphs = cameraPipe.createCameraGraphs(configs)"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraPipe.createCameraGraphs can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val cameraGraphs = cameraPipe.createCameraGraphs(configs)"
         errorLine2="                                                             ~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.getStreams can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                ~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                       ~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StreamGraph.get can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    cameraGraph.streams[viewfinderStreamConfig]!!"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.outputs can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val viewfinderOutputs = viewfinderStreams.map { it.outputs.single() }"
         errorLine2="                                                               ~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputStream.getSize can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    viewfinderOutputs[i].size,"
         errorLine2="                                         ~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            cameraGraphs[i].setSurface(viewfinderStreams[i].id, surface)"
         errorLine2="                                            ~~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setSurface-NYG5g8E can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            cameraGraphs[i].setSurface(viewfinderStreams[i].id, surface)"
         errorLine2="                                                                                ~~~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            cameraGraphs[i].setSurface(viewfinderStreams[i].id, surface)"
         errorLine2="                                                                            ~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.acquireSessionOrNull can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                cameraGraph.acquireSessionOrNull()!!.use {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    it.startRepeating("
         errorLine2="                       ~~~~~~~~~~~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Session.startRepeating can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        Request("
         errorLine2="                        ~~~~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraStream.id can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            streams = listOf(viewfinderStream.id)"
         errorLine2="                                                              ~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.start can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraGraph.start()"
         errorLine2="                    ~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setForeground can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraGraph.isForeground = true"
         errorLine2="                    ~~~~~~~~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.setForeground can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraGraph.isForeground = false"
         errorLine2="                    ~~~~~~~~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraGraph.stop can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraGraph.stop()"
         errorLine2="                    ~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Debug.formatCameraGraphProperties can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Debug.formatCameraGraphProperties(cameraMetadata, cameraConfig, cameraGraph)"
         errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Debug.formatCameraGraphProperties can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Debug.formatCameraGraphProperties(cameraMetadata, cameraConfig, cameraGraph)"
         errorLine2="                                          ~~~~~~~~~~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Debug.formatCameraGraphProperties can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Debug.formatCameraGraphProperties(cameraMetadata, cameraConfig, cameraGraph)"
         errorLine2="                                                          ~~~~~~~~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Debug.formatCameraGraphProperties can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Debug.formatCameraGraphProperties(cameraMetadata, cameraConfig, cameraGraph)"
         errorLine2="                                                                        ~~~~~~~~~~~">
diff --git a/camera/integration-tests/coretestapp/lint-baseline.xml b/camera/integration-tests/coretestapp/lint-baseline.xml
index b1ee614..4cbca68 100644
--- a/camera/integration-tests/coretestapp/lint-baseline.xml
+++ b/camera/integration-tests/coretestapp/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="BanThreadSleep"
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraInfoInternal can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                if (cameraInfo instanceof CameraInfoInternal) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceQuirks.getAll can only be called from within the same library (androidx.camera:camera-video)"
         errorLine1="                    Quirks deviceQuirks = DeviceQuirks.getAll();"
         errorLine2="                                                       ~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraInfoInternal can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Quirks cameraQuirks = ((CameraInfoInternal) cameraInfo).getCameraQuirks();"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraInfoInternal.getCameraQuirks can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    Quirks cameraQuirks = ((CameraInfoInternal) cameraInfo).getCameraQuirks();"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    if (deviceQuirks.contains(CrashWhenTakingPhotoWithAutoFlashAEModeQuirk.class)"
         errorLine2="                                     ~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    if (deviceQuirks.contains(CrashWhenTakingPhotoWithAutoFlashAEModeQuirk.class)"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            || cameraQuirks.contains(ImageCaptureFailWithAutoFlashQuirk.class)"
         errorLine2="                                            ~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            || cameraQuirks.contains(ImageCaptureFailWithAutoFlashQuirk.class)"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            || cameraQuirks.contains(ImageCaptureFlashNotFireQuirk.class)) {"
         errorLine2="                                            ~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Quirks.contains can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            || cameraQuirks.contains(ImageCaptureFlashNotFireQuirk.class)) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceQuirks.get can only be called from within the same library (androidx.camera:camera-video)"
         errorLine1="                    if (DeviceQuirks.get(MediaStoreVideoCannotWrite.class) != null) {"
         errorLine2="                                     ~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceQuirks.get can only be called from within the same library (androidx.camera:camera-video)"
         errorLine1="                    if (DeviceQuirks.get(MediaStoreVideoCannotWrite.class) != null) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Camera.isUseCasesCombinationSupported can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        return targetCamera.isUseCasesCombinationSupported(useCases.toArray(new UseCase[0]));"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            }, CameraXExecutors.directExecutor());"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        CameraXExecutors.mainThreadExecutor());"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        CameraXExecutors.mainThreadExecutor());"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AspectRatioUtil.ASPECT_RATIO_16_9 can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        ? AspectRatioUtil.ASPECT_RATIO_16_9 : AspectRatioUtil.ASPECT_RATIO_4_3;"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AspectRatioUtil.ASPECT_RATIO_4_3 can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        ? AspectRatioUtil.ASPECT_RATIO_16_9 : AspectRatioUtil.ASPECT_RATIO_4_3;"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Camera.isUseCasesCombinationSupported can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        return mCamera.isUseCasesCombinationSupported(buildUseCases().toArray(new UseCase[0]));"
         errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            CameraXExecutors.mainThreadExecutor());"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TransformationInfo.hasCameraTransform can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                                    mHasCameraTransform = transformationInfo.hasCameraTransform();"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TransformUtils.within360 can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            return within360((180 - mTextureRotationDegrees) + mSurfaceRotationDegrees);"
         errorLine2="                   ~~~~~~~~~">
@@ -209,115 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreviewView, &quot;Cannot get the preview view.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreviewView, &quot;Cannot get the preview view.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreviewView, &quot;Cannot get the preview view.&quot;);"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mDurationText, &quot;Cannot get the duration text view.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mDurationText, &quot;Cannot get the duration text view.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mDurationText, &quot;Cannot get the duration text view.&quot;);"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mSwitchTimeText, &quot;Cannot get the switch time text view.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mSwitchTimeText, &quot;Cannot get the switch time text view.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mSwitchTimeText, &quot;Cannot get the switch time text view.&quot;);"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mStartButton, &quot;Cannot get the start button view.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mStartButton, &quot;Cannot get the start button view.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mStartButton, &quot;Cannot get the start button view.&quot;);"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                Logger.d(TAG, msg);"
         errorLine2="                       ~">
@@ -326,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                Logger.d(TAG, msg);"
         errorLine2="                         ~~~">
@@ -335,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                Logger.d(TAG, msg);"
         errorLine2="                              ~~~">
@@ -344,142 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCamera, &quot;The camera instance should not be null.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCamera, &quot;The camera instance should not be null.&quot;);"
-        errorLine2="                                   ~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCamera, &quot;The camera instance should not be null.&quot;);"
-        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCameraProvider, &quot;The camera provider should not be null&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCameraProvider, &quot;The camera provider should not be null&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mCameraProvider, &quot;The camera provider should not be null&quot;);"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreview, &quot;The preview use case should not be null.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreview, &quot;The preview use case should not be null.&quot;);"
-        errorLine2="                                   ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mPreview, &quot;The preview use case should not be null.&quot;);"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                                   ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkNotNull(mVideoCapture, &quot;The video capture use case should not be null.&quot;);"
-        errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.d(TAG, msg);"
         errorLine2="                   ~">
@@ -488,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.d(TAG, msg);"
         errorLine2="                     ~~~">
@@ -497,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.d(TAG, msg);"
         errorLine2="                          ~~~">
@@ -506,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.canDeviceWriteToMediaStore can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (E2ETestUtil.canDeviceWriteToMediaStore()) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -515,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    E2ETestUtil.generateVideoMediaStoreOptions(this.getContentResolver(),"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -524,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    E2ETestUtil.generateVideoMediaStoreOptions(this.getContentResolver(),"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -533,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                            videoFileName));"
         errorLine2="                            ~~~~~~~~~~~~~">
@@ -542,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    E2ETestUtil.generateVideoFileOutputOptions(videoFileName, &quot;mp4&quot;));"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -551,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    E2ETestUtil.generateVideoFileOutputOptions(videoFileName, &quot;mp4&quot;));"
         errorLine2="                                                               ~~~~~~~~~~~~~">
@@ -560,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    E2ETestUtil.generateVideoFileOutputOptions(videoFileName, &quot;mp4&quot;));"
         errorLine2="                                                                              ~~~~~">
@@ -569,34 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                                        Preconditions.checkNotNull(mRecording, &quot;The in-progress &quot;"
-        errorLine2="                                                      ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                                        Preconditions.checkNotNull(mRecording, &quot;The in-progress &quot;"
-        errorLine2="                                                                   ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="                                        Preconditions.checkNotNull(mRecording, &quot;The in-progress &quot;"
-        errorLine2="                                                                               ^">
-        <location
-            file="src/main/java/androidx/camera/integration/core/VideoCameraSwitchingActivity.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        E2ETestUtil.writeTextToExternalFile(information,"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -605,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        E2ETestUtil.writeTextToExternalFile(information,"
         errorLine2="                                            ~~~~~~~~~~~">
@@ -614,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                generateFileName(INFO_FILE_PREFIX, false), &quot;txt&quot;);"
         errorLine2="                ~~~~~~~~~~~~~~~~">
@@ -623,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                generateFileName(INFO_FILE_PREFIX, false), &quot;txt&quot;);"
         errorLine2="                                                           ~~~~~">
@@ -632,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.isFileNameValid can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (!isUnique &amp;&amp; !E2ETestUtil.isFileNameValid(prefix)) {"
         errorLine2="                                      ~~~~~~~~~~~~~~~">
@@ -641,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.isFileNameValid can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (!isUnique &amp;&amp; !E2ETestUtil.isFileNameValid(prefix)) {"
         errorLine2="                                                      ~~~~~~">
@@ -650,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.isFileNameValid can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (E2ETestUtil.isFileNameValid(prefix)) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -659,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.isFileNameValid can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        if (E2ETestUtil.isFileNameValid(prefix)) {"
         errorLine2="                                        ~~~~~~">
diff --git a/camera/integration-tests/diagnosetestapp/lint-baseline.xml b/camera/integration-tests/diagnosetestapp/lint-baseline.xml
index d2c54a0..efaec07 100644
--- a/camera/integration-tests/diagnosetestapp/lint-baseline.xml
+++ b/camera/integration-tests/diagnosetestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Threads.checkMainThread can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        Threads.checkMainThread()"
         errorLine2="                ~~~~~~~~~~~~~~~">
@@ -10,22 +10,4 @@
             file="src/main/java/androidx/camera/integration/diagnose/ImageCaptureTask.kt"/>
     </issue>
 
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState(calibrationThreadId == Thread.currentThread().id,"
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/diagnose/MainActivity.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            &quot;Not working on Calibration Thread&quot;)"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/diagnose/MainActivity.kt"/>
-    </issue>
-
 </issues>
diff --git a/camera/integration-tests/extensionstestapp/lint-baseline.xml b/camera/integration-tests/extensionstestapp/lint-baseline.xml
index 6085300..f411714 100644
--- a/camera/integration-tests/extensionstestapp/lint-baseline.xml
+++ b/camera/integration-tests/extensionstestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Futures.immediateFuture can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="    private var imageSaveTerminationFuture: ListenableFuture&lt;Any?> = Futures.immediateFuture(null)"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Futures.immediateFuture can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="    private var imageSaveTerminationFuture: ListenableFuture&lt;Any?> = Futures.immediateFuture(null)"
         errorLine2="                                                                                             ~~~~">
@@ -20,25 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        Preconditions.checkState("
-        errorLine2="                      ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/extensions/Camera2ExtensionsActivity.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="            &quot;take picture button is only enabled when session is configured successfully&quot;"
-        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/extensions/Camera2ExtensionsActivity.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        mPreviewView.setFrameUpdateListener(CameraXExecutors.directExecutor(), (timestamp) -> {"
         errorLine2="                                                             ~~~~~~~~~~~~~~">
@@ -47,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="PreviewView.setFrameUpdateListener can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        mPreviewView.setFrameUpdateListener(CameraXExecutors.directExecutor(), (timestamp) -> {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
@@ -56,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.ioExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            imageAnalysis.setAnalyzer(CameraXExecutors.ioExecutor(),  img -> {"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -65,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.createFromFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        val exif = Exif.createFromFile(tempFile)"
         errorLine2="                        ~~~~~~~~~~~~~~">
@@ -74,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.createFromFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        val exif = Exif.createFromFile(tempFile)"
         errorLine2="                                       ~~~~~~~~">
@@ -83,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.rotate can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        exif.rotate(rotationDegrees)"
         errorLine2="             ~~~~~~">
@@ -92,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.save can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        exif.save()"
         errorLine2="             ~~~~">
@@ -101,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                CameraXExecutors.mainThreadExecutor()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
@@ -110,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                CameraXExecutors.mainThreadExecutor()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
@@ -119,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        CameraXExecutors.mainThreadExecutor()"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
diff --git a/camera/integration-tests/timingtestapp/lint-baseline.xml b/camera/integration-tests/timingtestapp/lint-baseline.xml
index 1cd635d..70291d7 100644
--- a/camera/integration-tests/timingtestapp/lint-baseline.xml
+++ b/camera/integration-tests/timingtestapp/lint-baseline.xml
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    surface, CameraXExecutors.directExecutor(),"
         errorLine2="                                              ~~~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                CameraXExecutors.mainThreadExecutor(),"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
diff --git a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
index d33c7ad..e080df6 100644
--- a/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
+++ b/camera/integration-tests/uiwidgetstestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            CameraXExecutors.mainThreadExecutor(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            CameraXExecutors.mainThreadExecutor(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            CameraXExecutors.mainThreadExecutor(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            CameraXExecutors.mainThreadExecutor(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -38,7 +38,25 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
+        message="UseCase.getAttachedSurfaceResolution can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        val resolution = mImageCapture.attachedSurfaceResolution"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/uiwidgets/rotations/CameraActivity.kt"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="UseCase.getAttachedSurfaceResolution can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        val resolution = mImageCapture.attachedSurfaceResolution"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/uiwidgets/rotations/CameraActivity.kt"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
         message="Exif.createFromFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        private val exif = Exif.createFromFile(file)"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -47,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.createFromFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        private val exif = Exif.createFromFile(file)"
         errorLine2="                                               ~~~~">
@@ -56,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getHeight can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                             ~~~~~~">
@@ -65,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getHeight can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                             ~~~~~~">
@@ -74,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getWidth can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                 ~~~~~">
@@ -83,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getWidth can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                 ~~~~~">
@@ -92,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getRotation can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getRotation() = exif.rotation"
         errorLine2="                                          ~~~~~~~~">
@@ -101,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getRotation can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getRotation() = exif.rotation"
         errorLine2="                                          ~~~~~~~~">
@@ -110,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.createFromInputStream can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            exif = Exif.createFromInputStream(inputStream!!)"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -119,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.createFromInputStream can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            exif = Exif.createFromInputStream(inputStream!!)"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -128,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getHeight can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                             ~~~~~~">
@@ -137,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getHeight can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                             ~~~~~~">
@@ -146,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getWidth can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                 ~~~~~">
@@ -155,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getWidth can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getResolution() = Size(exif.width, exif.height)"
         errorLine2="                                                 ~~~~~">
@@ -164,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getRotation can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getRotation() = exif.rotation"
         errorLine2="                                          ~~~~~~~~">
@@ -173,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Exif.getRotation can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        override fun getRotation() = exif.rotation"
         errorLine2="                                          ~~~~~~~~">
@@ -182,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputTransform.getMatrix can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        mlKitAnalyzer.updateTransform(outputTransform.matrix)"
         errorLine2="                                                      ~~~~~~">
@@ -191,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OutputTransform.getMatrix can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        mlKitAnalyzer.updateTransform(outputTransform.matrix)"
         errorLine2="                                                      ~~~~~~">
diff --git a/camera/integration-tests/viewfindertestapp/lint-baseline.xml b/camera/integration-tests/viewfindertestapp/lint-baseline.xml
index ce49f94..15b245a 100644
--- a/camera/integration-tests/viewfindertestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewfindertestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CompareSizesByArea can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    /* comp = */ CompareSizesByArea()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
diff --git a/camera/integration-tests/viewtestapp/lint-baseline.xml b/camera/integration-tests/viewtestapp/lint-baseline.xml
index 4bf28c2..acea7110 100644
--- a/camera/integration-tests/viewtestapp/lint-baseline.xml
+++ b/camera/integration-tests/viewtestapp/lint-baseline.xml
@@ -2,7 +2,151 @@
 <issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
+        message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                mainThreadExecutor(), mRotationListener);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            Logger.e(TAG, &quot;The device cannot detect rotation with motion sensor.&quot;);"
+        errorLine2="                   ~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            Logger.e(TAG, &quot;The device cannot detect rotation with motion sensor.&quot;);"
+        errorLine2="                     ~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            Logger.e(TAG, &quot;The device cannot detect rotation with motion sensor.&quot;);"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Futures.addCallback can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        Futures.addCallback(voidFuture, new FutureCallback&lt;Void>() {"
+        errorLine2="                ~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Futures.addCallback can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        Futures.addCallback(voidFuture, new FutureCallback&lt;Void>() {"
+        errorLine2="                            ~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Futures.addCallback can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        Futures.addCallback(voidFuture, new FutureCallback&lt;Void>() {"
+        errorLine2="                                        ^">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="FutureCallback.onSuccess can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            public void onSuccess(@Nullable Void result) {"
+        errorLine2="                        ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="FutureCallback.onFailure can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            public void onFailure(@NonNull Throwable t) {"
+        errorLine2="                        ~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        }, mainThreadExecutor());"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Futures.addCallback can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        }, mainThreadExecutor());"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="CameraSelector.getLensFacing can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        final Integer lensFacing = mCameraController.getCameraSelector().getLensFacing();"
+        errorLine2="                                                                         ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        mainThreadExecutor().execute(() -> {"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="TransformUtils.getRectToRect can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        Matrix croppingTransform = getRectToRect(new RectF(cropRect),"
+        errorLine2="                                   ~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="TransformUtils.getRectToRect can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="        Matrix croppingTransform = getRectToRect(new RectF(cropRect),"
+        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="TransformUtils.getRectToRect can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                new RectF(0, 0, cropRect.width(), cropRect.height()), 0);"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/CameraControllerFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        CameraXExecutors.mainThreadExecutor().execute {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
@@ -11,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraSelector.getLensFacing can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            if (cameraController.cameraSelector.lensFacing == LENS_FACING_BACK) {"
         errorLine2="                                                ~~~~~~~~~~">
@@ -20,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraSelector.getLensFacing can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            if (cameraController.cameraSelector.lensFacing == LENS_FACING_BACK) {"
         errorLine2="                                                ~~~~~~~~~~">
@@ -29,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            directExecutor(),"
         errorLine2="            ~~~~~~~~~~~~~~">
@@ -38,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            directExecutor()"
         errorLine2="            ~~~~~~~~~~~~~~">
@@ -47,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        cameraController.setImageAnalysisAnalyzer(mainThreadExecutor(),"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~">
@@ -56,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                mainThreadExecutor()"
         errorLine2="                ~~~~~~~~~~~~~~~~~~">
@@ -65,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
         errorLine2="                   ~">
@@ -74,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
         errorLine2="                     ~~~">
@@ -83,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -92,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            Logger.e(TAG, &quot;Failed to bind use cases.&quot;, exception)"
         errorLine2="                                                       ~~~~~~~~~">
@@ -101,7 +245,16 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
+        message="Camera.isUseCasesCombinationSupportedByFramework can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="            camera != null &amp;&amp; camera!!.isUseCasesCombinationSupportedByFramework(*useCases)"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/StreamSharingActivity.kt"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.directExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                CameraXExecutors.directExecutor(),"
         errorLine2="                                 ~~~~~~~~~~~~~~">
@@ -110,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.canDeviceWriteToMediaStore can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        return if (canDeviceWriteToMediaStore()) {"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -119,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                generateVideoMediaStoreOptions(context.contentResolver, fileName)"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -128,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                generateVideoMediaStoreOptions(context.contentResolver, fileName)"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -137,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoMediaStoreOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                generateVideoMediaStoreOptions(context.contentResolver, fileName)"
         errorLine2="                                                                        ~~~~~~~~">
@@ -146,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            recorder.prepareRecording(context, generateVideoFileOutputOptions(fileName))"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -155,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.generateVideoFileOutputOptions can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            recorder.prepareRecording(context, generateVideoFileOutputOptions(fileName))"
         errorLine2="                                                                              ~~~~~~~~">
@@ -164,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        writeTextToExternalFile(information, fileName)"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -173,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        writeTextToExternalFile(information, fileName)"
         errorLine2="                                ~~~~~~~~~~~">
@@ -182,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="E2ETestUtil.writeTextToExternalFile can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        writeTextToExternalFile(information, fileName)"
         errorLine2="                                             ~~~~~~~~">
@@ -191,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    VideoRecordEvent.Finalize.ERROR_SOURCE_INACTIVE -> Logger.d("
         errorLine2="                                                                              ~">
@@ -200,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        TAG,"
         errorLine2="                        ~~~">
@@ -209,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        &quot;Video saved to: $uri&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -218,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                    else -> Logger.e("
         errorLine2="                                   ~">
@@ -227,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        TAG,"
         errorLine2="                        ~~~">
@@ -236,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Logger.e can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                        &quot;Failed to save video: uri $uri with code (${event.error})&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -245,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.mainThreadExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="    IMAGE_CAPTURE, mainThreadExecutor(), ToneMappingImageProcessor(), {}"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~">
@@ -254,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraEffect.getImageProcessor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        return (imageProcessor as ToneMappingImageProcessor).processoed"
         errorLine2="                ~~~~~~~~~~~~~~">
@@ -263,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraEffect.getImageProcessor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        return (imageProcessor as ToneMappingImageProcessor).processoed"
         errorLine2="                ~~~~~~~~~~~~~~">
@@ -272,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val inputImage = request.inputImage as RgbaImageProxy"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -281,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy.createBitmap can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            val bitmap = inputImage.createBitmap()"
         errorLine2="                                    ~~~~~~~~~~~~">
@@ -290,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy.close can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            inputImage.close()"
         errorLine2="                       ~~~~~">
@@ -299,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            return RgbaImageProxy("
         errorLine2="                   ~~~~~~~~~~~~~~">
@@ -308,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                newBitmap,"
         errorLine2="                ~~~~~~~~~">
@@ -317,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                imageIn.cropRect,"
         errorLine2="                ~~~~~~~~~~~~~~~~">
@@ -326,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RgbaImageProxy can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="                imageIn.imageInfo.sensorToBufferTransformMatrix,"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -335,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ShaderProvider can only be accessed from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        private val TONE_MAPPING_SHADER_PROVIDER = object : ShaderProvider {"
         errorLine2="                                                            ~~~~~~~~~~~~~~">
@@ -344,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ShaderProvider.createFragmentShader can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="            override fun createFragmentShader(sampler: String, fragCoords: String): String {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -353,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="    private val glRenderer: OpenGlRenderer = OpenGlRenderer()"
         errorLine2="                                             ~~~~~~~~~~~~~~">
@@ -362,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.newHandlerExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        glExecutor = newHandlerExecutor(glHandler)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
@@ -371,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CameraXExecutors.newHandlerExecutor can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
         errorLine1="        glExecutor = newHandlerExecutor(glHandler)"
         errorLine2="                                        ~~~~~~~~~">
@@ -380,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
         errorLine2="                       ~~~~">
@@ -389,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -398,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.init can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.init(DynamicRange.SDR, TONE_MAPPING_SHADER_PROVIDER)"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -407,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.getTextureName can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="        val surfaceTexture = SurfaceTexture(glRenderer.textureName)"
         errorLine2="                                                       ~~~~~~~~~~~">
@@ -416,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.getTextureName can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="        val surfaceTexture = SurfaceTexture(glRenderer.textureName)"
         errorLine2="                                                       ~~~~~~~~~~~">
@@ -425,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.unregisterOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="                glRenderer.unregisterOutputSurface(removedSurface)"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -434,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.unregisterOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="                glRenderer.unregisterOutputSurface(removedSurface)"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -443,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.registerOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="        glRenderer.registerOutputSurface(surface)"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~">
@@ -452,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.registerOutputSurface can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="        glRenderer.registerOutputSurface(surface)"
         errorLine2="                                         ~~~~~~~">
@@ -461,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.release can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.release()"
         errorLine2="                       ~~~~~~~">
@@ -470,16 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.camera.integration-tests`)"
-        errorLine1="        checkState(GL_THREAD_NAME == Thread.currentThread().name)"
-        errorLine2="        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/camera/integration/view/ToneMappingSurfaceProcessor.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.render can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.render(surfaceTexture.timestamp, surfaceTransform, surface)"
         errorLine2="                       ~~~~~~">
@@ -488,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.render can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.render(surfaceTexture.timestamp, surfaceTransform, surface)"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~">
@@ -497,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OpenGlRenderer.render can only be called from within the same library (androidx.camera:camera-core)"
         errorLine1="            glRenderer.render(surfaceTexture.timestamp, surfaceTransform, surface)"
         errorLine2="                                                                          ~~~~~~~">
@@ -506,6 +650,60 @@
     </issue>
 
     <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                   ~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                     ~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                   ~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                     ~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Logger.d can only be called from within the same library group (referenced groupId=`androidx.camera` from groupId=`androidx.camera.integration-tests`)"
+        errorLine1="                            Logger.d(TAG, &quot;ImageAnalysis result not ready.&quot;);"
+        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/camera/integration/view/TransformFragment.java"/>
+    </issue>
+
+    <issue
         id="PermissionImpliesUnsupportedChromeOsHardware"
         message="Permission exists without corresponding hardware `&lt;uses-feature android:name=&quot;android.hardware.camera&quot; required=&quot;false&quot;>` tag"
         errorLine1="    &lt;uses-permission android:name=&quot;android.permission.CAMERA&quot; />"
diff --git a/car/app/app-automotive/lint-baseline.xml b/car/app/app-automotive/lint-baseline.xml
index 5859620..949fe8f 100644
--- a/car/app/app-automotive/lint-baseline.xml
+++ b/car/app/app-automotive/lint-baseline.xml
@@ -2,24 +2,6 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.car.app`)"
-        errorLine1="            Preconditions.checkState((carPropertyResponse.getStatus() == CarValue.STATUS_SUCCESS"
-        errorLine2="                          ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.car.app`)"
-        errorLine1="                    &quot;Invalid status and value combo: &quot; + carPropertyResponse);"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/hardware/common/CarPropertyResponse.java"/>
-    </issue>
-
-    <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.car.app.annotations.ExperimentalCarApi` or `@OptIn(markerClass = androidx.car.app.annotations.ExperimentalCarApi.class)`"
         errorLine1="                        Collections.singleton(CarZone.CAR_ZONE_GLOBAL)))"
diff --git a/car/app/app/lint-baseline.xml b/car/app/app/lint-baseline.xml
index 060b93f..3cc8390d 100644
--- a/car/app/app/lint-baseline.xml
+++ b/car/app/app/lint-baseline.xml
@@ -380,24 +380,6 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.car.app`)"
-        errorLine1="        checkState(!mMessages.isEmpty(), &quot;Message list cannot be empty.&quot;);"
-        errorLine2="        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/messaging/model/ConversationItem.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.car.app`)"
-        errorLine1="        checkState(!mMessages.isEmpty(), &quot;Message list cannot be empty.&quot;);"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/car/app/messaging/model/ConversationItem.java"/>
-    </issue>
-
-    <issue
         id="UnsafeOptInUsageError"
         message="This declaration is opt-in and its usage should be marked with `@androidx.car.app.annotations.ExperimentalCarApi` or `@OptIn(markerClass = androidx.car.app.annotations.ExperimentalCarApi.class)`"
         errorLine1="            } else if (rowObj instanceof ConversationItem) {"
diff --git a/compose/animation/animation-graphics/lint-baseline.xml b/compose/animation/animation-graphics/lint-baseline.xml
index 6f66ed4..4069768 100644
--- a/compose/animation/animation-graphics/lint-baseline.xml
+++ b/compose/animation/animation-graphics/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="PathParser.createPathFromPathData can only be called from within the same library (androidx.core:core)"
         errorLine1="                    PathInterpolator(PathParser.createPathFromPathData(pathData)).toEasing()"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/compose/ui/ui-text-google-fonts/lint-baseline.xml b/compose/ui/ui-text-google-fonts/lint-baseline.xml
index e45487ab..0ac1c03 100644
--- a/compose/ui/ui-text-google-fonts/lint-baseline.xml
+++ b/compose/ui/ui-text-google-fonts/lint-baseline.xml
@@ -2,34 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
-        message="FontResourcesParserCompat.readCerts can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="    return FontResourcesParserCompat.readCerts(resources, certificatesRes)"
-        errorLine2="                                     ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/compose/ui/text/googlefonts/FontProviderHelper.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FontResourcesParserCompat.readCerts can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="    return FontResourcesParserCompat.readCerts(resources, certificatesRes)"
-        errorLine2="                                               ~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/compose/ui/text/googlefonts/FontProviderHelper.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FontResourcesParserCompat.readCerts can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="    return FontResourcesParserCompat.readCerts(resources, certificatesRes)"
-        errorLine2="                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/compose/ui/text/googlefonts/FontProviderHelper.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontsContractCompat.requestFont can only be called from within the same library (androidx.core:core)"
         errorLine1="        FontsContractCompat.requestFont("
         errorLine2="                            ~~~~~~~~~~~">
diff --git a/compose/ui/ui/lint-baseline.xml b/compose/ui/ui/lint-baseline.xml
index 5a92c32..9e42097 100644
--- a/compose/ui/ui/lint-baseline.xml
+++ b/compose/ui/ui/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="BanHideTag"
@@ -56,303 +56,6 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.obtainAttributes can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="        val typedArray = TypedArrayUtils.obtainAttributes("
-        errorLine2="                                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.obtainAttributes can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            res,"
-        errorLine2="            ~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.obtainAttributes can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            theme,"
-        errorLine2="            ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.obtainAttributes can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            set,"
-        errorLine2="            ~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.obtainAttributes can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            attrs"
-        errorLine2="            ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedInt can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            val result = TypedArrayUtils.getNamedInt("
-        errorLine2="                                         ~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedInt can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                this,"
-        errorLine2="                ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedInt can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                xmlParser,"
-        errorLine2="                ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedInt can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                attrName,"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedInt can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId,"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedFloat can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            val result = TypedArrayUtils.getNamedFloat("
-        errorLine2="                                         ~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedFloat can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                this,"
-        errorLine2="                ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedFloat can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                xmlParser,"
-        errorLine2="                ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedFloat can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                attrName,"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedFloat can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId,"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedBoolean can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            val result = TypedArrayUtils.getNamedBoolean("
-        errorLine2="                                         ~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedBoolean can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                this,"
-        errorLine2="                ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedBoolean can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                xmlParser,"
-        errorLine2="                ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedBoolean can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                attrName,"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedBoolean can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId,"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            val result = TypedArrayUtils.getNamedComplexColor("
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                this,"
-        errorLine2="                ~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                xmlParser,"
-        errorLine2="                ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                theme,"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                attrName,"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId, defaultValue"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedComplexColor can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId, defaultValue"
-        errorLine2="                       ~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="            val result = TypedArrayUtils.getNamedColorStateList("
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                typedArray,"
-        errorLine2="                ~~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                xmlParser,"
-        errorLine2="                ~~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                theme,"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                attrName,"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TypedArrayUtils.getNamedColorStateList can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.compose.ui`)"
-        errorLine1="                resId"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/androidMain/kotlin/androidx/compose/ui/graphics/vector/compat/XmlVectorParser.android.kt"/>
-    </issue>
-
-    <issue
         id="PrimitiveInLambda"
         message="Use a functional interface instead of lambda syntax for lambdas with primitive values in constructor AlignmentLine has parameter &apos;merger&apos; with type Function2&lt;? super Integer, ? super Integer, Integer>."
         errorLine1="    internal val merger: (Int, Int) -> Int"
diff --git a/core/core-location-altitude/lint-baseline.xml b/core/core-location-altitude/lint-baseline.xml
index f8fe95f..034c3b4 100644
--- a/core/core-location-altitude/lint-baseline.xml
+++ b/core/core-location-altitude/lint-baseline.xml
@@ -2,8 +2,8 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        int sizeIj = 1 &lt;&lt; (S2CellIdUtils.MAX_LEVEL - params.getMapS2Level());"
         errorLine2="                                                            ~~~~~~~~~~~~~">
         <location
@@ -11,8 +11,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        long z11 = S2CellIdUtils.getParent(s2CellId, params.getMapS2Level());"
         errorLine2="                                                            ~~~~~~~~~~~~~">
         <location
@@ -20,8 +20,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                            params.getMapS2Level()),"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
@@ -29,8 +29,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                            params.getMapS2Level()),"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
@@ -38,8 +38,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                            params.getMapS2Level())"
         errorLine2="                                   ~~~~~~~~~~~~~">
         <location
@@ -47,8 +47,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        double sizeIj = 1 &lt;&lt; (S2CellIdUtils.MAX_LEVEL - params.getMapS2Level());"
         errorLine2="                                                               ~~~~~~~~~~~~~">
         <location
@@ -56,8 +56,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getModelRmseMeters can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getModelRmseMeters can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                        (float) Math.hypot(verticalAccuracyMeters, params.getModelRmseMeters()));"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~">
         <location
@@ -65,8 +65,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getCacheTileS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getCacheTileS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        return S2CellIdUtils.getParent(s2CellId, params.getCacheTileS2Level());"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -74,8 +74,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getDiskTileS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getDiskTileS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                S2CellIdUtils.getParent(s2CellId, params.getDiskTileS2Level()));"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
         <location
@@ -83,8 +83,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="S2TileProto.getByteBuffer can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="S2TileProto.getByteBuffer can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        ByteString byteString = tiles[tileIndex].getByteBuffer();"
         errorLine2="                                                 ~~~~~~~~~~~~~">
         <location
@@ -92,8 +92,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ByteString.isEmpty can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="ByteString.isEmpty can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        if (byteString.isEmpty()) {"
         errorLine2="                       ~~~~~~~">
         <location
@@ -101,8 +101,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ByteString.asReadOnlyByteBuffer can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="ByteString.asReadOnlyByteBuffer can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        ByteBuffer byteBuffer = byteString.asReadOnlyByteBuffer();"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -110,8 +110,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                params.getMapS2Level() - Integer.numberOfTrailingZeros(byteBuffer.limit()) / 2;"
         errorLine2="                       ~~~~~~~~~~~~~">
         <location
@@ -119,8 +119,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            int numBitsRightOfMap = 2 * (S2CellIdUtils.MAX_LEVEL - params.getMapS2Level()) + 1;"
         errorLine2="                                                                          ~~~~~~~~~~~~~">
         <location
@@ -128,8 +128,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="S2TileProto.getByteJpeg can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="S2TileProto.getByteJpeg can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        mergeByteImageValues(params, tiles[tileIndex].getByteJpeg(), s2CellIds, tiles, tileIndex,"
         errorLine2="                                                      ~~~~~~~~~~~">
         <location
@@ -137,8 +137,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="S2TileProto.getBytePng can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="S2TileProto.getBytePng can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        mergeByteImageValues(params, tiles[tileIndex].getBytePng(), s2CellIds, tiles, tileIndex,"
         errorLine2="                                                      ~~~~~~~~~~">
         <location
@@ -146,8 +146,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ByteString.isEmpty can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="ByteString.isEmpty can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        if (byteString.isEmpty()) {"
         errorLine2="                       ~~~~~~~">
         <location
@@ -155,8 +155,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ByteString.newInput can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="ByteString.newInput can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        try (InputStream inputStream = byteString.newInput()) {"
         errorLine2="                                                  ~~~~~~~~">
         <location
@@ -164,8 +164,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        return (iOrJ >> (S2CellIdUtils.MAX_LEVEL - params.getMapS2Level())) % widthOrHeight;"
         errorLine2="                                                          ~~~~~~~~~~~~~">
         <location
@@ -173,8 +173,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            Preconditions.checkArgument(S2CellIdUtils.getLevel(s2CellId) == params.getMapS2Level());"
         errorLine2="                                                                                   ~~~~~~~~~~~~~">
         <location
@@ -182,8 +182,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getModelAMeters can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getModelAMeters can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            heightsMeters[i] *= params.getModelAMeters();"
         errorLine2="                                       ~~~~~~~~~~~~~~~">
         <location
@@ -191,8 +191,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getModelBMeters can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getModelBMeters can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            heightsMeters[i] += params.getModelBMeters();"
         errorLine2="                                       ~~~~~~~~~~~~~~~">
         <location
@@ -200,8 +200,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getCacheTileS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getCacheTileS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                1 &lt;&lt; (2 * (params.getMapS2Level() - params.getCacheTileS2Level()));"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~">
         <location
@@ -209,8 +209,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                1 &lt;&lt; (2 * (params.getMapS2Level() - params.getCacheTileS2Level()));"
         errorLine2="                                  ~~~~~~~~~~~~~">
         <location
@@ -218,8 +218,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.getMapS2Level can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.getMapS2Level can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            long s2CellId = S2CellIdUtils.getTraversalStart(cacheKeys[i], params.getMapS2Level());"
         errorLine2="                                                                                 ~~~~~~~~~~~~~">
         <location
@@ -227,8 +227,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Builder.build can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="Builder.build can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                    S2TileProto.newBuilder().setByteBuffer(ByteString.copyFrom(bytes)).build();"
         errorLine2="                                                                                       ~~~~~">
         <location
@@ -236,8 +236,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Builder.setByteBuffer can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="Builder.setByteBuffer can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                    S2TileProto.newBuilder().setByteBuffer(ByteString.copyFrom(bytes)).build();"
         errorLine2="                                             ~~~~~~~~~~~~~">
         <location
@@ -245,8 +245,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ByteString.copyFrom can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="ByteString.copyFrom can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                    S2TileProto.newBuilder().setByteBuffer(ByteString.copyFrom(bytes)).build();"
         errorLine2="                                                                      ~~~~~~~~">
         <location
@@ -254,8 +254,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="S2TileProto.newBuilder can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="S2TileProto.newBuilder can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="                    S2TileProto.newBuilder().setByteBuffer(ByteString.copyFrom(bytes)).build();"
         errorLine2="                                ~~~~~~~~~~">
         <location
@@ -263,8 +263,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="AbstractMessageLite.toByteArray can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="AbstractMessageLite.toByteArray can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        return value.toByteArray();"
         errorLine2="                     ~~~~~~~~~~~">
         <location
@@ -272,8 +272,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="MapParamsProto.parseFrom can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="MapParamsProto.parseFrom can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            return MapParamsProto.parseFrom(byteArray);"
         errorLine2="                                  ~~~~~~~~~">
         <location
@@ -281,8 +281,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="AbstractMessageLite.toByteArray can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="AbstractMessageLite.toByteArray can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="        return tile.toByteArray();"
         errorLine2="                    ~~~~~~~~~~~">
         <location
@@ -290,8 +290,8 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="S2TileProto.parseFrom can only be called from within the same library (__local_aars__:/ssd/ssd5/androidx-main/out/androidx/core/core-location-altitude/build/repackaged/repackaged.jar)"
+        id="RestrictedApiAndroidX"
+        message="S2TileProto.parseFrom can only be called from within the same library (missing Maven coordinate due to repackaging)"
         errorLine1="            return S2TileProto.parseFrom(byteArray);"
         errorLine2="                               ~~~~~~~~~">
         <location
diff --git a/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml b/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
index b45623d..bfe0ecc 100644
--- a/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
+++ b/glance/glance-appwidget/integration-tests/demos/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProviderKt.ColorProvider can only be called from within the same library group (referenced groupId=`androidx.glance` from groupId=`androidx.glance.glance-appwidget.integration-tests`)"
         errorLine1="                color = ColorProvider(androidx.glance.R.color.glance_colorSecondary)"
         errorLine2="                        ~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProviderKt.ColorProvider can only be called from within the same library group (referenced groupId=`androidx.glance` from groupId=`androidx.glance.glance-appwidget.integration-tests`)"
         errorLine1="                color = ColorProvider(androidx.glance.R.color.glance_colorError),"
         errorLine2="                        ~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProviderKt.ColorProvider can only be called from within the same library group (referenced groupId=`androidx.glance` from groupId=`androidx.glance.glance-appwidget.integration-tests`)"
         errorLine1="                backgroundColor = ColorProvider("
         errorLine2="                                  ~~~~~~~~~~~~~">
diff --git a/glance/glance-appwidget/integration-tests/macrobenchmark-target/lint-baseline.xml b/glance/glance-appwidget/integration-tests/macrobenchmark-target/lint-baseline.xml
index 6ac3114..d23bbd9 100644
--- a/glance/glance-appwidget/integration-tests/macrobenchmark-target/lint-baseline.xml
+++ b/glance/glance-appwidget/integration-tests/macrobenchmark-target/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Tracing.enabled can only be accessed from within the same library group (referenced groupId=`androidx.glance` from groupId=`androidx.glance.glance-appwidget.integration-tests`)"
         errorLine1="        Tracing.enabled.set(true)"
         errorLine2="                ~~~~~~~">
diff --git a/glance/glance/lint-baseline.xml b/glance/glance/lint-baseline.xml
index d2fb308..7b47edb 100644
--- a/glance/glance/lint-baseline.xml
+++ b/glance/glance/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.glance`)"
         errorLine1="            .result.await()"
         errorLine2="                    ~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.glance`)"
         errorLine1="        (WorkManager.getInstance(context).getWorkInfosForUniqueWork(key).await()"
         errorLine2="                                                                         ~~~~~">
diff --git a/health/connect/connect-client/lint-baseline.xml b/health/connect/connect-client/lint-baseline.xml
index 65699a3..1959b87c 100644
--- a/health/connect/connect-client/lint-baseline.xml
+++ b/health/connect/connect-client/lint-baseline.xml
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = RequestProto.AggregateDataRequest.parseFrom(it)"
         errorLine2="                                                          ~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = ResponseProto.AggregateDataResponse.parseFrom(it)"
         errorLine2="                                                            ~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateMetricSpec.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.AggregateMetricSpec.newBuilder()"
         errorLine2="                                     ~~~~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataTypeName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setDataTypeName(dataTypeName)"
         errorLine2="         ~~~~~~~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAggregationType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setAggregationType(aggregationType.aggregationTypeString)"
         errorLine2="         ~~~~~~~~~~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFieldName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .apply { aggregationField?.let { fieldName = it } }"
         errorLine2="                                         ~~~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFieldName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .apply { aggregationField?.let { fieldName = it } }"
         errorLine2="                                         ~~~~~~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.AggregateDataRequest.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTimeSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setTimeSpec(timeRangeFilter.toProto())"
         errorLine2="         ~~~~~~~~~~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllDataOrigin(dataOriginFilter.toProtoList())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllMetricSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllMetricSpec(metrics.map { it.toProto() })"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.AggregateDataRequest.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTimeSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setTimeSpec(timeRangeFilter.toProto())"
         errorLine2="         ~~~~~~~~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllDataOrigin(dataOriginFilter.toProtoList())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllMetricSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllMetricSpec(metrics.map { it.toProto() })"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSliceDurationMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setSliceDurationMillis(timeRangeSlicer.toMillis())"
         errorLine2="         ~~~~~~~~~~~~~~~~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.AggregateDataRequest.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTimeSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setTimeSpec(timeRangeFilter.toProto())"
         errorLine2="         ~~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllDataOrigin(dataOriginFilter.toProtoList())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllMetricSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addAllMetricSpec(metrics.map { it.toProto() })"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSlicePeriod can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setSlicePeriod(timeRangeSlicer.toString())"
         errorLine2="         ~~~~~~~~~~~~~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    this.map { DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build() }"
         errorLine2="                                                                                  ~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    this.map { DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build() }"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    this.map { DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build() }"
         errorLine2="                                    ~~~~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ChangesEvent.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = ChangeProto.ChangesEvent.parseFrom(it)"
         errorLine2="                                                 ~~~~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ChangesEvent.getChangesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changes = extractApiChanges(proto.changesList),"
         errorLine2="                                          ~~~~~~~~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ChangesEvent.getChangesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changes = extractApiChanges(proto.changesList),"
         errorLine2="                                          ~~~~~~~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ChangesEvent.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        nextChangesToken = proto.nextChangesToken,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ChangesEvent.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        nextChangesToken = proto.nextChangesToken,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.hasDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="               ~~~~~~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.hasUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                intent.getProtoMessages(name = EXTRA_DATA_TYPES, parser = DataType::parseFrom)"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                intent.getProtoMessages(name = EXTRA_DATA_TYPES, parser = DataType::parseFrom)"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataType.newBuilder().setName(toDataTypeName()).build()"
         errorLine2="                                                    ~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataType.newBuilder().setName(toDataTypeName()).build()"
         errorLine2="                          ~~~~~~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataType.newBuilder().setName(toDataTypeName()).build()"
         errorLine2="             ~~~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="fun DataType.toDataTypeKClass(): KClass&lt;out Record> = name.toDataTypeKClass()"
         errorLine2="                                                      ~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="fun DataType.toDataTypeKClass(): KClass&lt;out Record> = name.toDataTypeKClass()"
         errorLine2="                                                      ~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.DataTypeIdPair.newBuilder().setDataType(dataTypeKC.toDataType()).setId(uid).build()"
         errorLine2="                                                                                             ~~~~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.DataTypeIdPair.newBuilder().setDataType(dataTypeKC.toDataType()).setId(uid).build()"
         errorLine2="                                             ~~~~~~~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.DataTypeIdPair.newBuilder().setDataType(dataTypeKC.toDataType()).setId(uid).build()"
         errorLine2="                                                                                  ~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataTypeIdPair.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.DataTypeIdPair.newBuilder().setDataType(dataTypeKC.toDataType()).setId(uid).build()"
         errorLine2="                                ~~~~~~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataTypeIdPair.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            RequestProto.DataTypeIdPair.newBuilder()"
         errorLine2="                                        ~~~~~~~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(dataTypeKC.toDataType())"
         errorLine2="                 ~~~~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setId(uid)"
         errorLine2="                 ~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRangeRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.DeleteDataRangeRequest.parseFrom(it)"
         errorLine2="                                                                ~~~~~~~~~">
@@ -1181,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRangeRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.DeleteDataRangeRequest.newBuilder()"
         errorLine2="                                        ~~~~~~~~~~">
@@ -1190,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .addDataType(dataTypeKC.toDataType())"
         errorLine2="         ~~~~~~~~~~~">
@@ -1199,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTimeSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setTimeSpec(timeRangeFilter.toProto())"
         errorLine2="         ~~~~~~~~~~~">
@@ -1208,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -1217,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return RequestProto.DeleteDataRequest.newBuilder()"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -1226,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllUids can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .addAllUids(obj.uids)"
         errorLine2="                 ~~~~~~~~~~">
@@ -1235,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllClientIds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .addAllClientIds(obj.clientIds)"
         errorLine2="                 ~~~~~~~~~~~~~~~">
@@ -1244,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -1253,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.DeleteDataRequest.parseFrom(it)"
         errorLine2="                                                           ~~~~~~~~~">
@@ -1262,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.getClientIdsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return DeleteDataRequest(proto.uidsList, proto.clientIdsList)"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -1271,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.getClientIdsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return DeleteDataRequest(proto.uidsList, proto.clientIdsList)"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -1280,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.getUidsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return DeleteDataRequest(proto.uidsList, proto.clientIdsList)"
         errorLine2="                                           ~~~~~~~~">
@@ -1289,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeleteDataRequest.getUidsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return DeleteDataRequest(proto.uidsList, proto.clientIdsList)"
         errorLine2="                                           ~~~~~~~~">
@@ -1298,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCode can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val builder = ErrorProto.ErrorStatus.newBuilder().setCode(errorCode)"
         errorLine2="                                                          ~~~~~~~">
@@ -1307,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val builder = ErrorProto.ErrorStatus.newBuilder().setCode(errorCode)"
         errorLine2="                                             ~~~~~~~~~~">
@@ -1316,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMessage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        errorMessage?.let(builder::setMessage)"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~">
@@ -1325,7 +1325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        builder.build()"
         errorLine2="                ~~~~~">
@@ -1334,7 +1334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = ErrorProto.ErrorStatus.parseFrom(it)"
         errorLine2="                                               ~~~~~~~~~">
@@ -1343,7 +1343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.getCode can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                proto.code,"
         errorLine2="                      ~~~~">
@@ -1352,7 +1352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.getCode can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                proto.code,"
         errorLine2="                      ~~~~">
@@ -1361,7 +1361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.getMessage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                if (proto.hasMessage()) proto.message else null,"
         errorLine2="                                              ~~~~~~~">
@@ -1370,7 +1370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.getMessage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                if (proto.hasMessage()) proto.message else null,"
         errorLine2="                                              ~~~~~~~">
@@ -1379,7 +1379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ErrorStatus.hasMessage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                if (proto.hasMessage()) proto.message else null,"
         errorLine2="                          ~~~~~~~~~~">
@@ -1388,7 +1388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = DataProto.DataPoint.SubTypeDataList.parseFrom(it)"
         errorLine2="                                                            ~~~~~~~~~">
@@ -1397,7 +1397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.GetChangesRequest.parseFrom(it)"
         errorLine2="                                                           ~~~~~~~~~">
@@ -1406,7 +1406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = ResponseProto.GetChangesResponse.parseFrom(it)"
         errorLine2="                                                         ~~~~~~~~~">
@@ -1415,7 +1415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesTokenRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.GetChangesTokenRequest.parseFrom(it)"
         errorLine2="                                                                ~~~~~~~~~">
@@ -1424,7 +1424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesTokenResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = ResponseProto.GetChangesTokenResponse.parseFrom(it)"
         errorLine2="                                                              ~~~~~~~~~">
@@ -1433,7 +1433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .map { PermissionProto.Permission.newBuilder().setPermission(it).build() }"
         errorLine2="                                                                                         ~~~~~">
@@ -1442,7 +1442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .map { PermissionProto.Permission.newBuilder().setPermission(it).build() }"
         errorLine2="                                                                       ~~~~~~~~~~~~~">
@@ -1451,7 +1451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .map { PermissionProto.Permission.newBuilder().setPermission(it).build() }"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -1460,7 +1460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .map { it.permission }"
         errorLine2="                          ~~~~~~~~~~">
@@ -1469,7 +1469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .map { it.permission }"
         errorLine2="                          ~~~~~~~~~~">
@@ -1478,7 +1478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesTokenRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    RequestProto.GetChangesTokenRequest.newBuilder()"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -1487,7 +1487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .addAllDataType(request.recordTypes.map { it.toDataType() })"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -1496,7 +1496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataOriginFilters can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .addAllDataOriginFilters("
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1505,7 +1505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                DataProto.DataOrigin.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1514,7 +1514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                    .setApplicationId(it.packageName)"
         errorLine2="                                     ~~~~~~~~~~~~~~~~">
@@ -1523,7 +1523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                    .build()"
         errorLine2="                                     ~~~~~">
@@ -1532,7 +1532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .build()"
         errorLine2="                         ~~~~~">
@@ -1541,7 +1541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesTokenResponse.getChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val changeToken = proto.changesToken"
         errorLine2="                                ~~~~~~~~~~~~">
@@ -1550,7 +1550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesTokenResponse.getChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val changeToken = proto.changesToken"
         errorLine2="                                ~~~~~~~~~~~~">
@@ -1559,7 +1559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    RequestProto.GetChangesRequest.newBuilder()"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -1568,7 +1568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .setChangesToken(changesToken)"
         errorLine2="                         ~~~~~~~~~~~~~~~">
@@ -1577,7 +1577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        .build()"
         errorLine2="                         ~~~~~">
@@ -1586,7 +1586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val nextToken = proto.nextChangesToken"
         errorLine2="                              ~~~~~~~~~~~~~~~~">
@@ -1595,7 +1595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val nextToken = proto.nextChangesToken"
         errorLine2="                              ~~~~~~~~~~~~~~~~">
@@ -1604,7 +1604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.first().retrieveAggregateDataRow()"
         errorLine2="                                   ~~~~~~~~">
@@ -1613,7 +1613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.first().retrieveAggregateDataRow()"
         errorLine2="                                   ~~~~~~~~">
@@ -1622,7 +1622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.map { it.toAggregateDataRowGroupByDuration() }.toList()"
         errorLine2="                                   ~~~~~~~~">
@@ -1631,7 +1631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.map { it.toAggregateDataRowGroupByDuration() }.toList()"
         errorLine2="                                   ~~~~~~~~">
@@ -1640,7 +1640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.map { it.toAggregateDataRowGroupByPeriod() }.toList()"
         errorLine2="                                   ~~~~~~~~">
@@ -1649,7 +1649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataResponse.getRowsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val result = responseProto.rowsList.map { it.toAggregateDataRowGroupByPeriod() }.toList()"
         errorLine2="                                   ~~~~~~~~">
@@ -1658,7 +1658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        PermissionProto.Permission.newBuilder().setPermission(it).build()"
         errorLine2="                                                                                  ~~~~~">
@@ -1667,7 +1667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        PermissionProto.Permission.newBuilder().setPermission(it).build()"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -1676,7 +1676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        PermissionProto.Permission.newBuilder().setPermission(it).build()"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -1685,7 +1685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                ?.map { it.proto.permission }"
         errorLine2="                                 ~~~~~~~~~~">
@@ -1694,7 +1694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getPermission can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                ?.map { it.proto.permission }"
         errorLine2="                                 ~~~~~~~~~~">
@@ -1703,7 +1703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InsertDataResponse.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return ResponseProto.InsertDataResponse.newBuilder()"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -1712,7 +1712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataPointUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .addAllDataPointUid(obj.dataPointUids)"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1721,7 +1721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -1730,7 +1730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InsertDataResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = ResponseProto.InsertDataResponse.parseFrom(it)"
         errorLine2="                                                             ~~~~~~~~~">
@@ -1739,7 +1739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InsertDataResponse.getDataPointUidList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return InsertDataResponse(proto.dataPointUidList)"
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
@@ -1748,7 +1748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InsertDataResponse.getDataPointUidList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return InsertDataResponse(proto.dataPointUidList)"
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
@@ -1757,7 +1757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AbstractMessageLite.toByteArray can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    putByteArraysExtra(name = name, byteArrays = messages.map { it.toByteArray() })"
         errorLine2="                                                                   ~~~~~~~~~~~">
@@ -1766,7 +1766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            val proto = PermissionProto.Permission.parseFrom(it)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -1775,7 +1775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AccessType.ACCESS_TYPE_WRITE can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        AccessTypes.WRITE -> PermissionProto.AccessType.ACCESS_TYPE_WRITE"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
@@ -1784,7 +1784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AccessType.ACCESS_TYPE_READ can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        AccessTypes.READ -> PermissionProto.AccessType.ACCESS_TYPE_READ"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~">
@@ -1793,7 +1793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AccessType.ACCESS_TYPE_UNKNOWN can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        else -> PermissionProto.AccessType.ACCESS_TYPE_UNKNOWN"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
@@ -1802,7 +1802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AccessType.ACCESS_TYPE_WRITE can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        PermissionProto.AccessType.ACCESS_TYPE_WRITE -> AccessTypes.WRITE"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~">
@@ -1811,7 +1811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AccessType.ACCESS_TYPE_READ can only be accessed from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        PermissionProto.AccessType.ACCESS_TYPE_READ -> AccessTypes.READ"
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
@@ -1820,7 +1820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    PermissionProto.Permission.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -1829,7 +1829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setDataType(recordType.toDataType())"
         errorLine2="         ~~~~~~~~~~~">
@@ -1838,7 +1838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAccessType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setAccessType(toAccessTypeProto(accessType))"
         errorLine2="         ~~~~~~~~~~~~~">
@@ -1847,7 +1847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -1856,7 +1856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    val dataTypeKClass = dataType.name.toDataTypeKClass()"
         errorLine2="                                  ~~~~">
@@ -1865,7 +1865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    val dataTypeKClass = dataType.name.toDataTypeKClass()"
         errorLine2="                                  ~~~~">
@@ -1874,7 +1874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    val dataTypeKClass = dataType.name.toDataTypeKClass()"
         errorLine2="                         ~~~~~~~~">
@@ -1883,7 +1883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    val dataTypeKClass = dataType.name.toDataTypeKClass()"
         errorLine2="                         ~~~~~~~~">
@@ -1892,7 +1892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getAccessType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return HealthPermission(dataTypeKClass, accessType.toAccessType())"
         errorLine2="                                            ~~~~~~~~~~">
@@ -1901,7 +1901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Permission.getAccessType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return HealthPermission(dataTypeKClass, accessType.toAccessType())"
         errorLine2="                                            ~~~~~~~~~~">
@@ -1910,7 +1910,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MessageLite.toByteArray can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    private val bytes: ByteArray by lazy { proto.toByteArray() }"
         errorLine2="                                                 ~~~~~~~~~~~">
@@ -1919,7 +1919,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.hasStartTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    require(hasStartTimeEpochMs()) { &quot;start time must be set&quot; }"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
@@ -1928,7 +1928,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.hasEndTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    require(hasEndTimeEpochMs()) { &quot;end time must be set&quot; }"
         errorLine2="            ~~~~~~~~~~~~~~~~~">
@@ -1937,7 +1937,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getStartTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        startTime = Instant.ofEpochMilli(startTimeEpochMs),"
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
@@ -1946,7 +1946,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getStartTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        startTime = Instant.ofEpochMilli(startTimeEpochMs),"
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
@@ -1955,7 +1955,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getEndTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        endTime = Instant.ofEpochMilli(endTimeEpochMs),"
         errorLine2="                                       ~~~~~~~~~~~~~~">
@@ -1964,7 +1964,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getEndTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        endTime = Instant.ofEpochMilli(endTimeEpochMs),"
         errorLine2="                                       ~~~~~~~~~~~~~~">
@@ -1973,7 +1973,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        zoneOffset = ZoneOffset.ofTotalSeconds(zoneOffsetSeconds)"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~">
@@ -1982,7 +1982,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        zoneOffset = ZoneOffset.ofTotalSeconds(zoneOffsetSeconds)"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~">
@@ -1991,7 +1991,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.hasStartLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    require(hasStartLocalDateTime()) { &quot;start time must be set&quot; }"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
@@ -2000,7 +2000,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.hasEndLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    require(hasEndLocalDateTime()) { &quot;end time must be set&quot; }"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
@@ -2009,7 +2009,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getStartLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        startTime = LocalDateTime.parse(startLocalDateTime),"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
@@ -2018,7 +2018,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getStartLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        startTime = LocalDateTime.parse(startLocalDateTime),"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~">
@@ -2027,7 +2027,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getEndLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        endTime = LocalDateTime.parse(endLocalDateTime),"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
@@ -2036,7 +2036,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getEndLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        endTime = LocalDateTime.parse(endLocalDateTime),"
         errorLine2="                                      ~~~~~~~~~~~~~~~~">
@@ -2045,7 +2045,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getLongValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        longValues = longValuesMap,"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -2054,7 +2054,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getLongValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        longValues = longValuesMap,"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -2063,7 +2063,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getDoubleValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        doubleValues = doubleValuesMap,"
         errorLine2="                       ~~~~~~~~~~~~~~~">
@@ -2072,7 +2072,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getDoubleValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        doubleValues = doubleValuesMap,"
         errorLine2="                       ~~~~~~~~~~~~~~~">
@@ -2081,7 +2081,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getDataOriginsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigins = dataOriginsList.mapTo(HashSet()) { DataOrigin(it.applicationId) }"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -2090,7 +2090,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AggregateDataRow.getDataOriginsList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigins = dataOriginsList.mapTo(HashSet()) { DataOrigin(it.applicationId) }"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -2099,7 +2099,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.getApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigins = dataOriginsList.mapTo(HashSet()) { DataOrigin(it.applicationId) }"
         errorLine2="                                                                       ~~~~~~~~~~~~~">
@@ -2108,7 +2108,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.getApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigins = dataOriginsList.mapTo(HashSet()) { DataOrigin(it.applicationId) }"
         errorLine2="                                                                       ~~~~~~~~~~~~~">
@@ -2117,7 +2117,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getChangesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changes = extractChanges(proto.changesList),"
         errorLine2="                                       ~~~~~~~~~~~">
@@ -2126,7 +2126,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getChangesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changes = extractChanges(proto.changesList),"
         errorLine2="                                       ~~~~~~~~~~~">
@@ -2135,7 +2135,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        nextChangesToken = proto.nextChangesToken,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
@@ -2144,7 +2144,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getNextChangesToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        nextChangesToken = proto.nextChangesToken,"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
@@ -2153,7 +2153,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getHasMore can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        hasMore = proto.hasMore,"
         errorLine2="                        ~~~~~~~">
@@ -2162,7 +2162,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getHasMore can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        hasMore = proto.hasMore,"
         errorLine2="                        ~~~~~~~">
@@ -2171,7 +2171,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getChangesTokenExpired can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changesTokenExpired = proto.changesTokenExpired"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2180,7 +2180,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GetChangesResponse.getChangesTokenExpired can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        changesTokenExpired = proto.changesTokenExpired"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2189,7 +2189,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -2198,7 +2198,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="                                                   ~~~~~~~~~">
@@ -2207,7 +2207,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.hasDeleteUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasDeleteUid() -> DeletionChange(it.deleteUid)"
         errorLine2="               ~~~~~~~~~~~~">
@@ -2216,7 +2216,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -2225,7 +2225,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.getUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -2234,7 +2234,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataChange.hasUpsertDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            it.hasUpsertDataPoint() -> UpsertionChange(toRecord(it.upsertDataPoint))"
         errorLine2="               ~~~~~~~~~~~~~~~~~~">
@@ -2243,7 +2243,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeResponse.getDataPointList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        records = proto.dataPointList.map { toRecord(it) as T },"
         errorLine2="                        ~~~~~~~~~~~~~">
@@ -2252,7 +2252,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeResponse.getDataPointList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        records = proto.dataPointList.map { toRecord(it) as T },"
         errorLine2="                        ~~~~~~~~~~~~~">
@@ -2261,7 +2261,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeResponse.getPageToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        pageToken = proto.pageToken"
         errorLine2="                          ~~~~~~~~~">
@@ -2270,7 +2270,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeResponse.getPageToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        pageToken = proto.pageToken"
         errorLine2="                          ~~~~~~~~~">
@@ -2279,7 +2279,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        when (dataType.name) {"
         errorLine2="              ~~~~~~~~">
@@ -2288,7 +2288,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        when (dataType.name) {"
         errorLine2="              ~~~~~~~~">
@@ -2297,7 +2297,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        when (dataType.name) {"
         errorLine2="                       ~~~~">
@@ -2306,7 +2306,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        when (dataType.name) {"
         errorLine2="                       ~~~~">
@@ -2315,7 +2315,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2324,7 +2324,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2333,7 +2333,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2342,7 +2342,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2351,7 +2351,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2360,7 +2360,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2369,7 +2369,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2378,7 +2378,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2387,7 +2387,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2396,7 +2396,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2405,7 +2405,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2414,7 +2414,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2423,7 +2423,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2432,7 +2432,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2441,7 +2441,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2450,7 +2450,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2459,7 +2459,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2468,7 +2468,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSeriesValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        seriesValuesList.map { value ->"
         errorLine2="                        ~~~~~~~~~~~~~~~~">
@@ -2477,7 +2477,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2486,7 +2486,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                time = Instant.ofEpochMilli(value.instantTimeMillis),"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -2495,7 +2495,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    segments = subTypeDataListsMap[&quot;segments&quot;]?.toSegmentList() ?: emptyList(),"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
@@ -2504,7 +2504,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    segments = subTypeDataListsMap[&quot;segments&quot;]?.toSegmentList() ?: emptyList(),"
         errorLine2="                               ~~~~~~~~~~~~~~~~~~~">
@@ -2513,7 +2513,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    laps = subTypeDataListsMap[&quot;laps&quot;]?.toLapList() ?: emptyList(),"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~">
@@ -2522,7 +2522,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    laps = subTypeDataListsMap[&quot;laps&quot;]?.toLapList() ?: emptyList(),"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~">
@@ -2531,7 +2531,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        subTypeDataListsMap[&quot;route&quot;]?.let {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -2540,7 +2540,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        subTypeDataListsMap[&quot;route&quot;]?.let {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -2549,7 +2549,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            ?: if (valuesMap[&quot;hasRoute&quot;]?.booleanVal == true)"
         errorLine2="                                   ~~~~~~~~~">
@@ -2558,7 +2558,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            ?: if (valuesMap[&quot;hasRoute&quot;]?.booleanVal == true)"
         errorLine2="                                   ~~~~~~~~~">
@@ -2567,7 +2567,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getBooleanVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            ?: if (valuesMap[&quot;hasRoute&quot;]?.booleanVal == true)"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -2576,7 +2576,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getBooleanVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            ?: if (valuesMap[&quot;hasRoute&quot;]?.booleanVal == true)"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -2585,7 +2585,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    biotin = valuesMap[&quot;biotin&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2594,7 +2594,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    biotin = valuesMap[&quot;biotin&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2603,7 +2603,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    biotin = valuesMap[&quot;biotin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2612,7 +2612,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    biotin = valuesMap[&quot;biotin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2621,7 +2621,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    caffeine = valuesMap[&quot;caffeine&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2630,7 +2630,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    caffeine = valuesMap[&quot;caffeine&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2639,7 +2639,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    caffeine = valuesMap[&quot;caffeine&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2648,7 +2648,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    caffeine = valuesMap[&quot;caffeine&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2657,7 +2657,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    calcium = valuesMap[&quot;calcium&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -2666,7 +2666,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    calcium = valuesMap[&quot;calcium&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -2675,7 +2675,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    calcium = valuesMap[&quot;calcium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -2684,7 +2684,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    calcium = valuesMap[&quot;calcium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -2693,7 +2693,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energy = valuesMap[&quot;calories&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                             ~~~~~~~~~">
@@ -2702,7 +2702,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energy = valuesMap[&quot;calories&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                             ~~~~~~~~~">
@@ -2711,7 +2711,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energy = valuesMap[&quot;calories&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -2720,7 +2720,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energy = valuesMap[&quot;calories&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -2729,7 +2729,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energyFromFat = valuesMap[&quot;caloriesFromFat&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                    ~~~~~~~~~">
@@ -2738,7 +2738,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energyFromFat = valuesMap[&quot;caloriesFromFat&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                    ~~~~~~~~~">
@@ -2747,7 +2747,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energyFromFat = valuesMap[&quot;caloriesFromFat&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -2756,7 +2756,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    energyFromFat = valuesMap[&quot;caloriesFromFat&quot;]?.doubleVal?.kilocalories,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -2765,7 +2765,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chloride = valuesMap[&quot;chloride&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2774,7 +2774,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chloride = valuesMap[&quot;chloride&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2783,7 +2783,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chloride = valuesMap[&quot;chloride&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2792,7 +2792,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chloride = valuesMap[&quot;chloride&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2801,7 +2801,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    cholesterol = valuesMap[&quot;cholesterol&quot;]?.doubleVal?.grams,"
         errorLine2="                                  ~~~~~~~~~">
@@ -2810,7 +2810,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    cholesterol = valuesMap[&quot;cholesterol&quot;]?.doubleVal?.grams,"
         errorLine2="                                  ~~~~~~~~~">
@@ -2819,7 +2819,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    cholesterol = valuesMap[&quot;cholesterol&quot;]?.doubleVal?.grams,"
         errorLine2="                                                            ~~~~~~~~~">
@@ -2828,7 +2828,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    cholesterol = valuesMap[&quot;cholesterol&quot;]?.doubleVal?.grams,"
         errorLine2="                                                            ~~~~~~~~~">
@@ -2837,7 +2837,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chromium = valuesMap[&quot;chromium&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2846,7 +2846,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chromium = valuesMap[&quot;chromium&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -2855,7 +2855,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chromium = valuesMap[&quot;chromium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2864,7 +2864,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    chromium = valuesMap[&quot;chromium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2873,7 +2873,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    copper = valuesMap[&quot;copper&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2882,7 +2882,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    copper = valuesMap[&quot;copper&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2891,7 +2891,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    copper = valuesMap[&quot;copper&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2900,7 +2900,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    copper = valuesMap[&quot;copper&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2909,7 +2909,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    dietaryFiber = valuesMap[&quot;dietaryFiber&quot;]?.doubleVal?.grams,"
         errorLine2="                                   ~~~~~~~~~">
@@ -2918,7 +2918,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    dietaryFiber = valuesMap[&quot;dietaryFiber&quot;]?.doubleVal?.grams,"
         errorLine2="                                   ~~~~~~~~~">
@@ -2927,7 +2927,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    dietaryFiber = valuesMap[&quot;dietaryFiber&quot;]?.doubleVal?.grams,"
         errorLine2="                                                              ~~~~~~~~~">
@@ -2936,7 +2936,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    dietaryFiber = valuesMap[&quot;dietaryFiber&quot;]?.doubleVal?.grams,"
         errorLine2="                                                              ~~~~~~~~~">
@@ -2945,7 +2945,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folate = valuesMap[&quot;folate&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2954,7 +2954,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folate = valuesMap[&quot;folate&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -2963,7 +2963,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folate = valuesMap[&quot;folate&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2972,7 +2972,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folate = valuesMap[&quot;folate&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -2981,7 +2981,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folicAcid = valuesMap[&quot;folicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -2990,7 +2990,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folicAcid = valuesMap[&quot;folicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -2999,7 +2999,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folicAcid = valuesMap[&quot;folicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3008,7 +3008,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    folicAcid = valuesMap[&quot;folicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3017,7 +3017,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iodine = valuesMap[&quot;iodine&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3026,7 +3026,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iodine = valuesMap[&quot;iodine&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3035,7 +3035,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iodine = valuesMap[&quot;iodine&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3044,7 +3044,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iodine = valuesMap[&quot;iodine&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3053,7 +3053,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iron = valuesMap[&quot;iron&quot;]?.doubleVal?.grams,"
         errorLine2="                           ~~~~~~~~~">
@@ -3062,7 +3062,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iron = valuesMap[&quot;iron&quot;]?.doubleVal?.grams,"
         errorLine2="                           ~~~~~~~~~">
@@ -3071,7 +3071,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iron = valuesMap[&quot;iron&quot;]?.doubleVal?.grams,"
         errorLine2="                                              ~~~~~~~~~">
@@ -3080,7 +3080,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    iron = valuesMap[&quot;iron&quot;]?.doubleVal?.grams,"
         errorLine2="                                              ~~~~~~~~~">
@@ -3089,7 +3089,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    magnesium = valuesMap[&quot;magnesium&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3098,7 +3098,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    magnesium = valuesMap[&quot;magnesium&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3107,7 +3107,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    magnesium = valuesMap[&quot;magnesium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3116,7 +3116,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    magnesium = valuesMap[&quot;magnesium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3125,7 +3125,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    manganese = valuesMap[&quot;manganese&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3134,7 +3134,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    manganese = valuesMap[&quot;manganese&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3143,7 +3143,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    manganese = valuesMap[&quot;manganese&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3152,7 +3152,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    manganese = valuesMap[&quot;manganese&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3161,7 +3161,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    molybdenum = valuesMap[&quot;molybdenum&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3170,7 +3170,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    molybdenum = valuesMap[&quot;molybdenum&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3179,7 +3179,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    molybdenum = valuesMap[&quot;molybdenum&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3188,7 +3188,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    molybdenum = valuesMap[&quot;molybdenum&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3197,7 +3197,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    monounsaturatedFat = valuesMap[&quot;monounsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                         ~~~~~~~~~">
@@ -3206,7 +3206,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    monounsaturatedFat = valuesMap[&quot;monounsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                         ~~~~~~~~~">
@@ -3215,7 +3215,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    monounsaturatedFat = valuesMap[&quot;monounsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -3224,7 +3224,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    monounsaturatedFat = valuesMap[&quot;monounsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -3233,7 +3233,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    niacin = valuesMap[&quot;niacin&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3242,7 +3242,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    niacin = valuesMap[&quot;niacin&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3251,7 +3251,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    niacin = valuesMap[&quot;niacin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3260,7 +3260,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    niacin = valuesMap[&quot;niacin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3269,7 +3269,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    pantothenicAcid = valuesMap[&quot;pantothenicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                      ~~~~~~~~~">
@@ -3278,7 +3278,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    pantothenicAcid = valuesMap[&quot;pantothenicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                      ~~~~~~~~~">
@@ -3287,7 +3287,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    pantothenicAcid = valuesMap[&quot;pantothenicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -3296,7 +3296,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    pantothenicAcid = valuesMap[&quot;pantothenicAcid&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -3305,7 +3305,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    phosphorus = valuesMap[&quot;phosphorus&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3314,7 +3314,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    phosphorus = valuesMap[&quot;phosphorus&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3323,7 +3323,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    phosphorus = valuesMap[&quot;phosphorus&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3332,7 +3332,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    phosphorus = valuesMap[&quot;phosphorus&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3341,7 +3341,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    polyunsaturatedFat = valuesMap[&quot;polyunsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                         ~~~~~~~~~">
@@ -3350,7 +3350,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    polyunsaturatedFat = valuesMap[&quot;polyunsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                         ~~~~~~~~~">
@@ -3359,7 +3359,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    polyunsaturatedFat = valuesMap[&quot;polyunsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -3368,7 +3368,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    polyunsaturatedFat = valuesMap[&quot;polyunsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -3377,7 +3377,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    potassium = valuesMap[&quot;potassium&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3386,7 +3386,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    potassium = valuesMap[&quot;potassium&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3395,7 +3395,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    potassium = valuesMap[&quot;potassium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3404,7 +3404,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    potassium = valuesMap[&quot;potassium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3413,7 +3413,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    protein = valuesMap[&quot;protein&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -3422,7 +3422,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    protein = valuesMap[&quot;protein&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -3431,7 +3431,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    protein = valuesMap[&quot;protein&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -3440,7 +3440,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    protein = valuesMap[&quot;protein&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -3449,7 +3449,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    riboflavin = valuesMap[&quot;riboflavin&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3458,7 +3458,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    riboflavin = valuesMap[&quot;riboflavin&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3467,7 +3467,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    riboflavin = valuesMap[&quot;riboflavin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3476,7 +3476,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    riboflavin = valuesMap[&quot;riboflavin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3485,7 +3485,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    saturatedFat = valuesMap[&quot;saturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                   ~~~~~~~~~">
@@ -3494,7 +3494,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    saturatedFat = valuesMap[&quot;saturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                   ~~~~~~~~~">
@@ -3503,7 +3503,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    saturatedFat = valuesMap[&quot;saturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                              ~~~~~~~~~">
@@ -3512,7 +3512,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    saturatedFat = valuesMap[&quot;saturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                              ~~~~~~~~~">
@@ -3521,7 +3521,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    selenium = valuesMap[&quot;selenium&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3530,7 +3530,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    selenium = valuesMap[&quot;selenium&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3539,7 +3539,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    selenium = valuesMap[&quot;selenium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3548,7 +3548,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    selenium = valuesMap[&quot;selenium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3557,7 +3557,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sodium = valuesMap[&quot;sodium&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3566,7 +3566,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sodium = valuesMap[&quot;sodium&quot;]?.doubleVal?.grams,"
         errorLine2="                             ~~~~~~~~~">
@@ -3575,7 +3575,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sodium = valuesMap[&quot;sodium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3584,7 +3584,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sodium = valuesMap[&quot;sodium&quot;]?.doubleVal?.grams,"
         errorLine2="                                                  ~~~~~~~~~">
@@ -3593,7 +3593,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sugar = valuesMap[&quot;sugar&quot;]?.doubleVal?.grams,"
         errorLine2="                            ~~~~~~~~~">
@@ -3602,7 +3602,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sugar = valuesMap[&quot;sugar&quot;]?.doubleVal?.grams,"
         errorLine2="                            ~~~~~~~~~">
@@ -3611,7 +3611,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sugar = valuesMap[&quot;sugar&quot;]?.doubleVal?.grams,"
         errorLine2="                                                ~~~~~~~~~">
@@ -3620,7 +3620,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    sugar = valuesMap[&quot;sugar&quot;]?.doubleVal?.grams,"
         errorLine2="                                                ~~~~~~~~~">
@@ -3629,7 +3629,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    thiamin = valuesMap[&quot;thiamin&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -3638,7 +3638,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    thiamin = valuesMap[&quot;thiamin&quot;]?.doubleVal?.grams,"
         errorLine2="                              ~~~~~~~~~">
@@ -3647,7 +3647,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    thiamin = valuesMap[&quot;thiamin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -3656,7 +3656,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    thiamin = valuesMap[&quot;thiamin&quot;]?.doubleVal?.grams,"
         errorLine2="                                                    ~~~~~~~~~">
@@ -3665,7 +3665,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalCarbohydrate = valuesMap[&quot;totalCarbohydrate&quot;]?.doubleVal?.grams,"
         errorLine2="                                        ~~~~~~~~~">
@@ -3674,7 +3674,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalCarbohydrate = valuesMap[&quot;totalCarbohydrate&quot;]?.doubleVal?.grams,"
         errorLine2="                                        ~~~~~~~~~">
@@ -3683,7 +3683,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalCarbohydrate = valuesMap[&quot;totalCarbohydrate&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -3692,7 +3692,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalCarbohydrate = valuesMap[&quot;totalCarbohydrate&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -3701,7 +3701,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalFat = valuesMap[&quot;totalFat&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3710,7 +3710,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalFat = valuesMap[&quot;totalFat&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3719,7 +3719,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalFat = valuesMap[&quot;totalFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3728,7 +3728,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    totalFat = valuesMap[&quot;totalFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3737,7 +3737,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    transFat = valuesMap[&quot;transFat&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3746,7 +3746,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    transFat = valuesMap[&quot;transFat&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3755,7 +3755,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    transFat = valuesMap[&quot;transFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3764,7 +3764,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    transFat = valuesMap[&quot;transFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3773,7 +3773,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    unsaturatedFat = valuesMap[&quot;unsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                     ~~~~~~~~~">
@@ -3782,7 +3782,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    unsaturatedFat = valuesMap[&quot;unsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                     ~~~~~~~~~">
@@ -3791,7 +3791,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    unsaturatedFat = valuesMap[&quot;unsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -3800,7 +3800,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    unsaturatedFat = valuesMap[&quot;unsaturatedFat&quot;]?.doubleVal?.grams,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -3809,7 +3809,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminA = valuesMap[&quot;vitaminA&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3818,7 +3818,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminA = valuesMap[&quot;vitaminA&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3827,7 +3827,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminA = valuesMap[&quot;vitaminA&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3836,7 +3836,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminA = valuesMap[&quot;vitaminA&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3845,7 +3845,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB12 = valuesMap[&quot;vitaminB12&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3854,7 +3854,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB12 = valuesMap[&quot;vitaminB12&quot;]?.doubleVal?.grams,"
         errorLine2="                                 ~~~~~~~~~">
@@ -3863,7 +3863,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB12 = valuesMap[&quot;vitaminB12&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3872,7 +3872,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB12 = valuesMap[&quot;vitaminB12&quot;]?.doubleVal?.grams,"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3881,7 +3881,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB6 = valuesMap[&quot;vitaminB6&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3890,7 +3890,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB6 = valuesMap[&quot;vitaminB6&quot;]?.doubleVal?.grams,"
         errorLine2="                                ~~~~~~~~~">
@@ -3899,7 +3899,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB6 = valuesMap[&quot;vitaminB6&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3908,7 +3908,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminB6 = valuesMap[&quot;vitaminB6&quot;]?.doubleVal?.grams,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -3917,7 +3917,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminC = valuesMap[&quot;vitaminC&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3926,7 +3926,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminC = valuesMap[&quot;vitaminC&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3935,7 +3935,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminC = valuesMap[&quot;vitaminC&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3944,7 +3944,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminC = valuesMap[&quot;vitaminC&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3953,7 +3953,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminD = valuesMap[&quot;vitaminD&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3962,7 +3962,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminD = valuesMap[&quot;vitaminD&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3971,7 +3971,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminD = valuesMap[&quot;vitaminD&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3980,7 +3980,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminD = valuesMap[&quot;vitaminD&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -3989,7 +3989,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminE = valuesMap[&quot;vitaminE&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -3998,7 +3998,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminE = valuesMap[&quot;vitaminE&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -4007,7 +4007,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminE = valuesMap[&quot;vitaminE&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -4016,7 +4016,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminE = valuesMap[&quot;vitaminE&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -4025,7 +4025,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminK = valuesMap[&quot;vitaminK&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -4034,7 +4034,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminK = valuesMap[&quot;vitaminK&quot;]?.doubleVal?.grams,"
         errorLine2="                               ~~~~~~~~~">
@@ -4043,7 +4043,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminK = valuesMap[&quot;vitaminK&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -4052,7 +4052,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    vitaminK = valuesMap[&quot;vitaminK&quot;]?.doubleVal?.grams,"
         errorLine2="                                                      ~~~~~~~~~">
@@ -4061,7 +4061,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    zinc = valuesMap[&quot;zinc&quot;]?.doubleVal?.grams,"
         errorLine2="                           ~~~~~~~~~">
@@ -4070,7 +4070,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    zinc = valuesMap[&quot;zinc&quot;]?.doubleVal?.grams,"
         errorLine2="                           ~~~~~~~~~">
@@ -4079,7 +4079,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    zinc = valuesMap[&quot;zinc&quot;]?.doubleVal?.grams,"
         errorLine2="                                              ~~~~~~~~~">
@@ -4088,7 +4088,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    zinc = valuesMap[&quot;zinc&quot;]?.doubleVal?.grams,"
         errorLine2="                                              ~~~~~~~~~">
@@ -4097,7 +4097,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    stages = subTypeDataListsMap[&quot;stages&quot;]?.toStageList() ?: emptyList(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
@@ -4106,7 +4106,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getSubTypeDataListsMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    stages = subTypeDataListsMap[&quot;stages&quot;]?.toStageList() ?: emptyList(),"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
@@ -4115,7 +4115,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            else -> throw RuntimeException(&quot;Unknown data type ${dataType.name}&quot;)"
         errorLine2="                                                                ~~~~~~~~">
@@ -4124,7 +4124,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            else -> throw RuntimeException(&quot;Unknown data type ${dataType.name}&quot;)"
         errorLine2="                                                                ~~~~~~~~">
@@ -4133,7 +4133,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            else -> throw RuntimeException(&quot;Unknown data type ${dataType.name}&quot;)"
         errorLine2="                                                                         ~~~~">
@@ -4142,7 +4142,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.getName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            else -> throw RuntimeException(&quot;Unknown data type ${dataType.name}&quot;)"
         errorLine2="                                                                         ~~~~">
@@ -4151,7 +4151,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        protoWrapper.proto.valuesList.map { value ->"
         errorLine2="                           ~~~~~~~~~~">
@@ -4160,7 +4160,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        protoWrapper.proto.valuesList.map { value ->"
         errorLine2="                           ~~~~~~~~~~">
@@ -4169,7 +4169,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                time = Instant.ofEpochMilli(value.startTimeMillis),"
         errorLine2="                                                  ~~~~~~~~~~~~~~~">
@@ -4178,7 +4178,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                time = Instant.ofEpochMilli(value.startTimeMillis),"
         errorLine2="                                                  ~~~~~~~~~~~~~~~">
@@ -4187,7 +4187,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                latitude = value.valuesMap[&quot;latitude&quot;]!!.doubleVal,"
         errorLine2="                                 ~~~~~~~~~">
@@ -4196,7 +4196,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                latitude = value.valuesMap[&quot;latitude&quot;]!!.doubleVal,"
         errorLine2="                                 ~~~~~~~~~">
@@ -4205,7 +4205,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                latitude = value.valuesMap[&quot;latitude&quot;]!!.doubleVal,"
         errorLine2="                                                         ~~~~~~~~~">
@@ -4214,7 +4214,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                latitude = value.valuesMap[&quot;latitude&quot;]!!.doubleVal,"
         errorLine2="                                                         ~~~~~~~~~">
@@ -4223,7 +4223,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                longitude = value.valuesMap[&quot;longitude&quot;]!!.doubleVal,"
         errorLine2="                                  ~~~~~~~~~">
@@ -4232,7 +4232,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                longitude = value.valuesMap[&quot;longitude&quot;]!!.doubleVal,"
         errorLine2="                                  ~~~~~~~~~">
@@ -4241,7 +4241,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                longitude = value.valuesMap[&quot;longitude&quot;]!!.doubleVal,"
         errorLine2="                                                           ~~~~~~~~~">
@@ -4250,7 +4250,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                longitude = value.valuesMap[&quot;longitude&quot;]!!.doubleVal,"
         errorLine2="                                                           ~~~~~~~~~">
@@ -4259,7 +4259,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                altitude = value.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                 ~~~~~~~~~">
@@ -4268,7 +4268,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                altitude = value.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                 ~~~~~~~~~">
@@ -4277,7 +4277,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                altitude = value.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -4286,7 +4286,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                altitude = value.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                                        ~~~~~~~~~">
@@ -4295,7 +4295,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                horizontalAccuracy = value.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                           ~~~~~~~~~">
@@ -4304,7 +4304,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                horizontalAccuracy = value.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                           ~~~~~~~~~">
@@ -4313,7 +4313,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                horizontalAccuracy = value.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                             ~~~~~~~~~">
@@ -4322,7 +4322,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                horizontalAccuracy = value.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                             ~~~~~~~~~">
@@ -4331,7 +4331,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                verticalAccuracy = value.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters"
         errorLine2="                                         ~~~~~~~~~">
@@ -4340,7 +4340,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                verticalAccuracy = value.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters"
         errorLine2="                                         ~~~~~~~~~">
@@ -4349,7 +4349,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                verticalAccuracy = value.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters"
         errorLine2="                                                                         ~~~~~~~~~">
@@ -4358,7 +4358,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                verticalAccuracy = value.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters"
         errorLine2="                                                                         ~~~~~~~~~">
@@ -4367,7 +4367,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(startTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
@@ -4376,7 +4376,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(startTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~~~">
@@ -4385,7 +4385,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(endTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~">
@@ -4394,7 +4394,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(endTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~">
@@ -4403,7 +4403,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(instantTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
@@ -4412,7 +4412,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = Instant.ofEpochMilli(instantTimeMillis)"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
@@ -4421,7 +4421,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getStartZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        if (hasStartZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(startZoneOffsetSeconds) else null"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4430,7 +4430,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getStartZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        if (hasStartZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(startZoneOffsetSeconds) else null"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4439,7 +4439,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasStartZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        if (hasStartZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(startZoneOffsetSeconds) else null"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4448,7 +4448,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getEndZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasEndZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(endZoneOffsetSeconds) else null"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~">
@@ -4457,7 +4457,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getEndZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasEndZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(endZoneOffsetSeconds) else null"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~">
@@ -4466,7 +4466,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasEndZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasEndZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(endZoneOffsetSeconds) else null"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4475,7 +4475,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(zoneOffsetSeconds) else null"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -4484,7 +4484,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(zoneOffsetSeconds) else null"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~">
@@ -4493,7 +4493,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    get() = if (hasZoneOffsetSeconds()) ZoneOffset.ofTotalSeconds(zoneOffsetSeconds) else null"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~">
@@ -4502,7 +4502,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4511,7 +4511,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4520,7 +4520,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="                    ~~~~~~~">
@@ -4529,7 +4529,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="                    ~~~~~~~">
@@ -4538,7 +4538,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4547,7 +4547,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4556,7 +4556,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="                    ~~~~~~~~~">
@@ -4565,7 +4565,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="                    ~~~~~~~~~">
@@ -4574,7 +4574,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun DataPointOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -4583,7 +4583,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun DataPointOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -4592,7 +4592,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getStringVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun DataPointOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                                  ~~~~~~~~~">
@@ -4601,7 +4601,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getStringVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun DataPointOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                                  ~~~~~~~~~">
@@ -4610,7 +4610,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesMap[key]?.enumVal"
         errorLine2="           ~~~~~~~~~">
@@ -4619,7 +4619,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPointOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesMap[key]?.enumVal"
         errorLine2="           ~~~~~~~~~">
@@ -4628,7 +4628,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesMap[key]?.enumVal"
         errorLine2="                           ~~~~~~~">
@@ -4637,7 +4637,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesMap[key]?.enumVal"
         errorLine2="                           ~~~~~~~">
@@ -4646,7 +4646,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4655,7 +4655,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4664,7 +4664,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="                    ~~~~~~~">
@@ -4673,7 +4673,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.longVal ?: defaultVal"
         errorLine2="                    ~~~~~~~">
@@ -4682,7 +4682,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4691,7 +4691,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="    ~~~~~~~~~">
@@ -4700,7 +4700,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="                    ~~~~~~~~~">
@@ -4709,7 +4709,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    valuesMap[key]?.doubleVal ?: defaultVal"
         errorLine2="                    ~~~~~~~~~">
@@ -4718,7 +4718,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -4727,7 +4727,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -4736,7 +4736,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getStringVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                                    ~~~~~~~~~">
@@ -4745,7 +4745,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getStringVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getString(key: String): String? = valuesMap[key]?.stringVal"
         errorLine2="                                                                                    ~~~~~~~~~">
@@ -4754,7 +4754,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getEnum(key: String): String? = valuesMap[key]?.enumVal"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -4763,7 +4763,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValueOrBuilder.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getEnum(key: String): String? = valuesMap[key]?.enumVal"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -4772,7 +4772,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getEnum(key: String): String? = valuesMap[key]?.enumVal"
         errorLine2="                                                                                  ~~~~~~~">
@@ -4781,7 +4781,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="internal fun SeriesValueOrBuilder.getEnum(key: String): String? = valuesMap[key]?.enumVal"
         errorLine2="                                                                                  ~~~~~~~">
@@ -4790,7 +4790,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            id = if (hasUid()) uid else Metadata.EMPTY_ID,"
         errorLine2="                               ~~~">
@@ -4799,7 +4799,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            id = if (hasUid()) uid else Metadata.EMPTY_ID,"
         errorLine2="                               ~~~">
@@ -4808,7 +4808,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            id = if (hasUid()) uid else Metadata.EMPTY_ID,"
         errorLine2="                     ~~~~~~">
@@ -4817,7 +4817,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.getApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            dataOrigin = DataOrigin(dataOrigin.applicationId),"
         errorLine2="                                               ~~~~~~~~~~~~~">
@@ -4826,7 +4826,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.getApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            dataOrigin = DataOrigin(dataOrigin.applicationId),"
         errorLine2="                                               ~~~~~~~~~~~~~">
@@ -4835,7 +4835,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            dataOrigin = DataOrigin(dataOrigin.applicationId),"
         errorLine2="                                    ~~~~~~~~~~">
@@ -4844,7 +4844,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            dataOrigin = DataOrigin(dataOrigin.applicationId),"
         errorLine2="                                    ~~~~~~~~~~">
@@ -4853,7 +4853,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getUpdateTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            lastModifiedTime = Instant.ofEpochMilli(updateTimeMillis),"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~">
@@ -4862,7 +4862,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getUpdateTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            lastModifiedTime = Instant.ofEpochMilli(updateTimeMillis),"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~">
@@ -4871,7 +4871,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getClientId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            clientRecordId = if (hasClientId()) clientId else null,"
         errorLine2="                                                ~~~~~~~~">
@@ -4880,7 +4880,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getClientId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            clientRecordId = if (hasClientId()) clientId else null,"
         errorLine2="                                                ~~~~~~~~">
@@ -4889,7 +4889,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasClientId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            clientRecordId = if (hasClientId()) clientId else null,"
         errorLine2="                                 ~~~~~~~~~~~">
@@ -4898,7 +4898,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getClientVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            clientRecordVersion = clientVersion,"
         errorLine2="                                  ~~~~~~~~~~~~~">
@@ -4907,7 +4907,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getClientVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            clientRecordVersion = clientVersion,"
         errorLine2="                                  ~~~~~~~~~~~~~">
@@ -4916,7 +4916,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDevice can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            device = if (hasDevice()) device.toDevice() else null,"
         errorLine2="                                      ~~~~~~">
@@ -4925,7 +4925,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getDevice can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            device = if (hasDevice()) device.toDevice() else null,"
         errorLine2="                                      ~~~~~~">
@@ -4934,7 +4934,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.hasDevice can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            device = if (hasDevice()) device.toDevice() else null,"
         errorLine2="                         ~~~~~~~~~">
@@ -4943,7 +4943,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getRecordingMethod can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            recordingMethod = recordingMethod"
         errorLine2="                              ~~~~~~~~~~~~~~~">
@@ -4952,7 +4952,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.getRecordingMethod can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            recordingMethod = recordingMethod"
         errorLine2="                              ~~~~~~~~~~~~~~~">
@@ -4961,7 +4961,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getManufacturer can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        manufacturer = if (hasManufacturer()) manufacturer else null,"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -4970,7 +4970,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getManufacturer can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        manufacturer = if (hasManufacturer()) manufacturer else null,"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -4979,7 +4979,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.hasManufacturer can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        manufacturer = if (hasManufacturer()) manufacturer else null,"
         errorLine2="                           ~~~~~~~~~~~~~~~">
@@ -4988,7 +4988,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getModel can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        model = if (hasModel()) model else null,"
         errorLine2="                                ~~~~~">
@@ -4997,7 +4997,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getModel can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        model = if (hasModel()) model else null,"
         errorLine2="                                ~~~~~">
@@ -5006,7 +5006,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.hasModel can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        model = if (hasModel()) model else null,"
         errorLine2="                    ~~~~~~~~">
@@ -5015,7 +5015,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        type = DEVICE_TYPE_STRING_TO_INT_MAP.getOrDefault(type, Device.TYPE_UNKNOWN)"
         errorLine2="                                                          ~~~~">
@@ -5024,7 +5024,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.getType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        type = DEVICE_TYPE_STRING_TO_INT_MAP.getOrDefault(type, Device.TYPE_UNKNOWN)"
         errorLine2="                                                          ~~~~">
@@ -5033,7 +5033,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5042,7 +5042,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5051,7 +5051,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5060,7 +5060,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5069,7 +5069,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5078,7 +5078,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5087,7 +5087,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            stage = STAGE_TYPE_STRING_TO_INT_MAP[it.valuesMap[&quot;stage&quot;]?.enumVal]"
         errorLine2="                                                    ~~~~~~~~~">
@@ -5096,7 +5096,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            stage = STAGE_TYPE_STRING_TO_INT_MAP[it.valuesMap[&quot;stage&quot;]?.enumVal]"
         errorLine2="                                                    ~~~~~~~~~">
@@ -5105,7 +5105,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            stage = STAGE_TYPE_STRING_TO_INT_MAP[it.valuesMap[&quot;stage&quot;]?.enumVal]"
         errorLine2="                                                                        ~~~~~~~">
@@ -5114,7 +5114,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            stage = STAGE_TYPE_STRING_TO_INT_MAP[it.valuesMap[&quot;stage&quot;]?.enumVal]"
         errorLine2="                                                                        ~~~~~~~">
@@ -5123,7 +5123,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5132,7 +5132,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5141,7 +5141,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5150,7 +5150,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5159,7 +5159,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5168,7 +5168,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5177,7 +5177,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            segmentType = (it.valuesMap[&quot;type&quot;]?.longVal ?: EXERCISE_SEGMENT_TYPE_UNKNOWN).toInt(),"
         errorLine2="                              ~~~~~~~~~">
@@ -5186,7 +5186,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            segmentType = (it.valuesMap[&quot;type&quot;]?.longVal ?: EXERCISE_SEGMENT_TYPE_UNKNOWN).toInt(),"
         errorLine2="                              ~~~~~~~~~">
@@ -5195,7 +5195,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            segmentType = (it.valuesMap[&quot;type&quot;]?.longVal ?: EXERCISE_SEGMENT_TYPE_UNKNOWN).toInt(),"
         errorLine2="                                                 ~~~~~~~">
@@ -5204,7 +5204,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            segmentType = (it.valuesMap[&quot;type&quot;]?.longVal ?: EXERCISE_SEGMENT_TYPE_UNKNOWN).toInt(),"
         errorLine2="                                                 ~~~~~~~">
@@ -5213,7 +5213,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            repetitions = it.valuesMap[&quot;reps&quot;]?.longVal?.toInt() ?: 0"
         errorLine2="                             ~~~~~~~~~">
@@ -5222,7 +5222,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            repetitions = it.valuesMap[&quot;reps&quot;]?.longVal?.toInt() ?: 0"
         errorLine2="                             ~~~~~~~~~">
@@ -5231,7 +5231,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            repetitions = it.valuesMap[&quot;reps&quot;]?.longVal?.toInt() ?: 0"
         errorLine2="                                                ~~~~~~~">
@@ -5240,7 +5240,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            repetitions = it.valuesMap[&quot;reps&quot;]?.longVal?.toInt() ?: 0"
         errorLine2="                                                ~~~~~~~">
@@ -5249,7 +5249,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5258,7 +5258,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5267,7 +5267,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5276,7 +5276,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            startTime = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -5285,7 +5285,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5294,7 +5294,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            endTime = Instant.ofEpochMilli(it.endTimeMillis),"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -5303,7 +5303,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            length = it.valuesMap[&quot;length&quot;]?.doubleVal?.meters,"
         errorLine2="                        ~~~~~~~~~">
@@ -5312,7 +5312,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            length = it.valuesMap[&quot;length&quot;]?.doubleVal?.meters,"
         errorLine2="                        ~~~~~~~~~">
@@ -5321,7 +5321,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            length = it.valuesMap[&quot;length&quot;]?.doubleVal?.meters,"
         errorLine2="                                             ~~~~~~~~~">
@@ -5330,7 +5330,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            length = it.valuesMap[&quot;length&quot;]?.doubleVal?.meters,"
         errorLine2="                                             ~~~~~~~~~">
@@ -5339,7 +5339,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5348,7 +5348,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.getValuesList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return valuesList.map {"
         errorLine2="           ~~~~~~~~~~">
@@ -5357,7 +5357,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            time = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                           ~~~~~~~~~~~~~~~">
@@ -5366,7 +5366,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            time = Instant.ofEpochMilli(it.startTimeMillis),"
         errorLine2="                                           ~~~~~~~~~~~~~~~">
@@ -5375,7 +5375,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            latitude = it.valuesMap[&quot;latitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                          ~~~~~~~~~">
@@ -5384,7 +5384,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            latitude = it.valuesMap[&quot;latitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                          ~~~~~~~~~">
@@ -5393,7 +5393,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            latitude = it.valuesMap[&quot;latitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                                                 ~~~~~~~~~">
@@ -5402,7 +5402,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            latitude = it.valuesMap[&quot;latitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                                                 ~~~~~~~~~">
@@ -5411,7 +5411,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            longitude = it.valuesMap[&quot;longitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                           ~~~~~~~~~">
@@ -5420,7 +5420,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            longitude = it.valuesMap[&quot;longitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                           ~~~~~~~~~">
@@ -5429,7 +5429,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            longitude = it.valuesMap[&quot;longitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                                                   ~~~~~~~~~">
@@ -5438,7 +5438,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            longitude = it.valuesMap[&quot;longitude&quot;]?.doubleVal ?: 0.0,"
         errorLine2="                                                   ~~~~~~~~~">
@@ -5447,7 +5447,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            altitude = it.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                          ~~~~~~~~~">
@@ -5456,7 +5456,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            altitude = it.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                          ~~~~~~~~~">
@@ -5465,7 +5465,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            altitude = it.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                                 ~~~~~~~~~">
@@ -5474,7 +5474,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            altitude = it.valuesMap[&quot;altitude&quot;]?.doubleVal?.meters,"
         errorLine2="                                                 ~~~~~~~~~">
@@ -5483,7 +5483,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            horizontalAccuracy = it.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                    ~~~~~~~~~">
@@ -5492,7 +5492,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            horizontalAccuracy = it.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                    ~~~~~~~~~">
@@ -5501,7 +5501,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            horizontalAccuracy = it.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                      ~~~~~~~~~">
@@ -5510,7 +5510,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            horizontalAccuracy = it.valuesMap[&quot;horizontal_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                      ~~~~~~~~~">
@@ -5519,7 +5519,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            verticalAccuracy = it.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                  ~~~~~~~~~">
@@ -5528,7 +5528,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.getValuesMap can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            verticalAccuracy = it.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                  ~~~~~~~~~">
@@ -5537,7 +5537,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            verticalAccuracy = it.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -5546,7 +5546,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.getDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            verticalAccuracy = it.valuesMap[&quot;vertical_accuracy&quot;]?.doubleVal?.meters,"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -5555,7 +5555,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataResponse.getDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        resultFuture.set(response.proto.dataPoint)"
         errorLine2="                                        ~~~~~~~~~">
@@ -5564,7 +5564,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataResponse.getDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        resultFuture.set(response.proto.dataPoint)"
         errorLine2="                                        ~~~~~~~~~">
@@ -5573,7 +5573,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.ReadDataRangeRequest.parseFrom(it)"
         errorLine2="                                                              ~~~~~~~~~">
@@ -5582,7 +5582,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return RequestProto.ReadDataRangeRequest.newBuilder()"
         errorLine2="                                             ~~~~~~~~~~">
@@ -5591,7 +5591,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setDataType(request.recordType.toDataType())"
         errorLine2="         ~~~~~~~~~~~">
@@ -5600,7 +5600,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTimeSpec can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            setTimeSpec(request.timeRangeFilter.toProto())"
         errorLine2="            ~~~~~~~~~~~">
@@ -5609,7 +5609,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataOriginFilters can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            addAllDataOriginFilters("
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5618,7 +5618,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build()"
         errorLine2="                                                                                       ~~~~~">
@@ -5627,7 +5627,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build()"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~">
@@ -5636,7 +5636,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    DataProto.DataOrigin.newBuilder().setApplicationId(it.packageName).build()"
         errorLine2="                                         ~~~~~~~~~~">
@@ -5645,7 +5645,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAscOrdering can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            setAscOrdering(request.ascendingOrder)"
         errorLine2="            ~~~~~~~~~~~~~~">
@@ -5654,7 +5654,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPageSize can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            setPageSize(request.pageSize)"
         errorLine2="            ~~~~~~~~~~~">
@@ -5663,7 +5663,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPageToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            request.pageToken?.let { setPageToken(it) }"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -5672,7 +5672,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -5681,7 +5681,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRangeResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = ResponseProto.ReadDataRangeResponse.parseFrom(it)"
         errorLine2="                                                                ~~~~~~~~~">
@@ -5690,7 +5690,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.ReadDataRequest.parseFrom(it)"
         errorLine2="                                                         ~~~~~~~~~">
@@ -5699,7 +5699,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    RequestProto.ReadDataRequest.newBuilder()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -5708,7 +5708,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataTypeIdPair can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setDataTypeIdPair(toDataTypeIdPairProto(dataTypeKC, uid))"
         errorLine2="         ~~~~~~~~~~~~~~~~~">
@@ -5717,7 +5717,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -5726,7 +5726,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadDataResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = ResponseProto.ReadDataResponse.parseFrom(it)"
         errorLine2="                                                           ~~~~~~~~~">
@@ -5735,7 +5735,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadExerciseRouteRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val proto = RequestProto.ReadExerciseRouteRequest.parseFrom(it)"
         errorLine2="                                                          ~~~~~~~~~">
@@ -5744,7 +5744,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ReadExerciseRouteResponse.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = ResponseProto.ReadExerciseRouteResponse.parseFrom(it)"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -5753,7 +5753,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BasalBodyTemperature&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5762,7 +5762,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;temperature&quot;, doubleVal(temperature.inCelsius))"
         errorLine2="                    ~~~~~~~~~">
@@ -5771,7 +5771,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;measurementLocation&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5780,7 +5780,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5789,7 +5789,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BasalMetabolicRate&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5798,7 +5798,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;bmr&quot;, doubleVal(basalMetabolicRate.inKilocaloriesPerDay)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -5807,7 +5807,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5816,7 +5816,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BloodGlucose&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5825,7 +5825,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;level&quot;, doubleVal(level.inMillimolesPerLiter))"
         errorLine2="                    ~~~~~~~~~">
@@ -5834,7 +5834,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;specimenSource&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5843,7 +5843,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;mealType&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -5852,7 +5852,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;relationToMeal&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5861,7 +5861,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5870,7 +5870,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BloodPressure&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5879,7 +5879,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;systolic&quot;, doubleVal(systolic.inMillimetersOfMercury))"
         errorLine2="                    ~~~~~~~~~">
@@ -5888,7 +5888,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;diastolic&quot;, doubleVal(diastolic.inMillimetersOfMercury))"
         errorLine2="                    ~~~~~~~~~">
@@ -5897,7 +5897,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;bodyPosition&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5906,7 +5906,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;measurementLocation&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5915,7 +5915,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5924,7 +5924,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BodyFat&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5933,7 +5933,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;percentage&quot;, doubleVal(percentage.value)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -5942,7 +5942,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5951,7 +5951,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BodyTemperature&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5960,7 +5960,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;temperature&quot;, doubleVal(temperature.inCelsius))"
         errorLine2="                    ~~~~~~~~~">
@@ -5969,7 +5969,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;measurementLocation&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -5978,7 +5978,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -5987,7 +5987,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BodyWaterMass&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -5996,7 +5996,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;mass&quot;, doubleVal(mass.inKilograms)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6005,7 +6005,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6014,7 +6014,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;BoneMass&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6023,7 +6023,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;mass&quot;, doubleVal(mass.inKilograms)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6032,7 +6032,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6041,7 +6041,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;CervicalMucus&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6050,7 +6050,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;texture&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -6059,7 +6059,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;amount&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -6068,7 +6068,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6077,7 +6077,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                DataProto.SeriesValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -6086,7 +6086,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .putValues(&quot;rpm&quot;, doubleVal(sample.revolutionsPerMinute))"
         errorLine2="                     ~~~~~~~~~">
@@ -6095,7 +6095,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .setInstantTimeMillis(sample.time.toEpochMilli())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -6104,7 +6104,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .build()"
         errorLine2="                     ~~~~~">
@@ -6113,7 +6113,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                DataProto.SeriesValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -6122,7 +6122,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .putValues(&quot;bpm&quot;, longVal(sample.beatsPerMinute))"
         errorLine2="                     ~~~~~~~~~">
@@ -6131,7 +6131,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .setInstantTimeMillis(sample.time.toEpochMilli())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -6140,7 +6140,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .build()"
         errorLine2="                     ~~~~~">
@@ -6149,7 +6149,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Height&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6158,7 +6158,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;height&quot;, doubleVal(height.inMeters)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6167,7 +6167,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6176,7 +6176,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;HeartRateVariabilityRmssd&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6185,7 +6185,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;heartRateVariability&quot;, doubleVal(heartRateVariabilityMillis)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6194,7 +6194,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6203,7 +6203,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            instantaneousProto().setDataType(protoDataType(&quot;IntermenstrualBleeding&quot;)).build()"
         errorLine2="                                                                                      ~~~~~">
@@ -6212,7 +6212,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            instantaneousProto().setDataType(protoDataType(&quot;IntermenstrualBleeding&quot;)).build()"
         errorLine2="                                 ~~~~~~~~~~~">
@@ -6221,7 +6221,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;LeanBodyMass&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6230,7 +6230,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;mass&quot;, doubleVal(mass.inKilograms)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6239,7 +6239,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6248,7 +6248,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Menstruation&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6257,7 +6257,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;flow&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -6266,7 +6266,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6275,7 +6275,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            intervalProto().setDataType(protoDataType(&quot;MenstruationPeriod&quot;)).build()"
         errorLine2="                                                                             ~~~~~">
@@ -6284,7 +6284,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            intervalProto().setDataType(protoDataType(&quot;MenstruationPeriod&quot;)).build()"
         errorLine2="                            ~~~~~~~~~~~">
@@ -6293,7 +6293,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;OvulationTest&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6302,7 +6302,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;result&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -6311,7 +6311,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6320,7 +6320,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;OxygenSaturation&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6329,7 +6329,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;percentage&quot;, doubleVal(percentage.value)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6338,7 +6338,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6347,7 +6347,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                DataProto.SeriesValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -6356,7 +6356,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .putValues(&quot;power&quot;, doubleVal(sample.power.inWatts))"
         errorLine2="                     ~~~~~~~~~">
@@ -6365,7 +6365,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .setInstantTimeMillis(sample.time.toEpochMilli())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -6374,7 +6374,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .build()"
         errorLine2="                     ~~~~~">
@@ -6383,7 +6383,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;RespiratoryRate&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6392,7 +6392,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;rate&quot;, doubleVal(rate)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6401,7 +6401,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6410,7 +6410,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;RestingHeartRate&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6419,7 +6419,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;bpm&quot;, longVal(beatsPerMinute)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6428,7 +6428,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6437,7 +6437,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;SexualActivity&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6446,7 +6446,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;protectionUsed&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -6455,7 +6455,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6464,7 +6464,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                DataProto.SeriesValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -6473,7 +6473,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .putValues(&quot;speed&quot;, doubleVal(sample.speed.inMetersPerSecond))"
         errorLine2="                     ~~~~~~~~~">
@@ -6482,7 +6482,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .setInstantTimeMillis(sample.time.toEpochMilli())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -6491,7 +6491,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .build()"
         errorLine2="                     ~~~~~">
@@ -6500,7 +6500,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SeriesValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                DataProto.SeriesValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -6509,7 +6509,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .putValues(&quot;rate&quot;, doubleVal(sample.rate))"
         errorLine2="                     ~~~~~~~~~">
@@ -6518,7 +6518,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .setInstantTimeMillis(sample.time.toEpochMilli())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -6527,7 +6527,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    .build()"
         errorLine2="                     ~~~~~">
@@ -6536,7 +6536,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Vo2Max&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6545,7 +6545,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;vo2&quot;, doubleVal(vo2MillilitersPerMinuteKilogram))"
         errorLine2="                    ~~~~~~~~~">
@@ -6554,7 +6554,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        ?.let { putValues(&quot;measurementMethod&quot;, it) }"
         errorLine2="                                ~~~~~~~~~">
@@ -6563,7 +6563,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6572,7 +6572,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Weight&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6581,7 +6581,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;weight&quot;, doubleVal(weight.inKilograms)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6590,7 +6590,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6599,7 +6599,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;ActiveCaloriesBurned&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6608,7 +6608,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;energy&quot;, doubleVal(energy.inKilocalories)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6617,7 +6617,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6626,7 +6626,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;ActivitySession&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6635,7 +6635,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .putValues(&quot;hasRoute&quot;, boolVal(exerciseRouteResult !is ExerciseRouteResult.NoData))"
         errorLine2="                 ~~~~~~~~~">
@@ -6644,7 +6644,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    putValues(&quot;activityType&quot;, exerciseType)"
         errorLine2="                    ~~~~~~~~~">
@@ -6653,7 +6653,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    title?.let { putValues(&quot;title&quot;, stringVal(it)) }"
         errorLine2="                                 ~~~~~~~~~">
@@ -6662,7 +6662,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    notes?.let { putValues(&quot;notes&quot;, stringVal(it)) }"
         errorLine2="                                 ~~~~~~~~~">
@@ -6671,7 +6671,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putSubTypeDataLists can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putSubTypeDataLists("
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -6680,7 +6680,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            DataProto.DataPoint.SubTypeDataList.newBuilder()"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -6689,7 +6689,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .addAllValues(segments.map { it.toProto() })"
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -6698,7 +6698,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .build()"
         errorLine2="                                 ~~~~~">
@@ -6707,7 +6707,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putSubTypeDataLists can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putSubTypeDataLists("
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -6716,7 +6716,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            DataProto.DataPoint.SubTypeDataList.newBuilder()"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -6725,7 +6725,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .addAllValues(laps.map { it.toProto() })"
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -6734,7 +6734,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .build()"
         errorLine2="                                 ~~~~~">
@@ -6743,7 +6743,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putSubTypeDataLists can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putSubTypeDataLists("
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -6752,7 +6752,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            DataProto.DataPoint.SubTypeDataList.newBuilder()"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -6761,7 +6761,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .addAllValues("
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -6770,7 +6770,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .build()"
         errorLine2="                                 ~~~~~">
@@ -6779,7 +6779,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6788,7 +6788,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Distance&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6797,7 +6797,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;distance&quot;, doubleVal(distance.inMeters)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6806,7 +6806,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6815,7 +6815,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;ElevationGained&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6824,7 +6824,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;elevation&quot;, doubleVal(elevation.inMeters)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6833,7 +6833,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6842,7 +6842,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;FloorsClimbed&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6851,7 +6851,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;floors&quot;, doubleVal(floors)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6860,7 +6860,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6869,7 +6869,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Hydration&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6878,7 +6878,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;volume&quot;, doubleVal(volume.inLiters)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -6887,7 +6887,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -6896,7 +6896,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Nutrition&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -6905,7 +6905,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;biotin&quot;, doubleVal(biotin.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6914,7 +6914,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;caffeine&quot;, doubleVal(caffeine.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6923,7 +6923,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;calcium&quot;, doubleVal(calcium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6932,7 +6932,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;calories&quot;, doubleVal(energy.inKilocalories))"
         errorLine2="                        ~~~~~~~~~">
@@ -6941,7 +6941,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;caloriesFromFat&quot;, doubleVal(energyFromFat.inKilocalories))"
         errorLine2="                        ~~~~~~~~~">
@@ -6950,7 +6950,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;chloride&quot;, doubleVal(chloride.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6959,7 +6959,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;cholesterol&quot;, doubleVal(cholesterol.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6968,7 +6968,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;chromium&quot;, doubleVal(chromium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6977,7 +6977,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;copper&quot;, doubleVal(copper.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6986,7 +6986,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;dietaryFiber&quot;, doubleVal(dietaryFiber.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -6995,7 +6995,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;folate&quot;, doubleVal(folate.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7004,7 +7004,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;folicAcid&quot;, doubleVal(folicAcid.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7013,7 +7013,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;iodine&quot;, doubleVal(iodine.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7022,7 +7022,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;iron&quot;, doubleVal(iron.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7031,7 +7031,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;magnesium&quot;, doubleVal(magnesium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7040,7 +7040,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;manganese&quot;, doubleVal(manganese.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7049,7 +7049,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;molybdenum&quot;, doubleVal(molybdenum.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7058,7 +7058,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;monounsaturatedFat&quot;, doubleVal(monounsaturatedFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7067,7 +7067,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;niacin&quot;, doubleVal(niacin.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7076,7 +7076,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;pantothenicAcid&quot;, doubleVal(pantothenicAcid.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7085,7 +7085,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;phosphorus&quot;, doubleVal(phosphorus.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7094,7 +7094,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;polyunsaturatedFat&quot;, doubleVal(polyunsaturatedFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7103,7 +7103,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;potassium&quot;, doubleVal(potassium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7112,7 +7112,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;protein&quot;, doubleVal(protein.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7121,7 +7121,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;riboflavin&quot;, doubleVal(riboflavin.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7130,7 +7130,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;saturatedFat&quot;, doubleVal(saturatedFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7139,7 +7139,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;selenium&quot;, doubleVal(selenium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7148,7 +7148,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;sodium&quot;, doubleVal(sodium.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7157,7 +7157,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;sugar&quot;, doubleVal(sugar.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7166,7 +7166,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;thiamin&quot;, doubleVal(thiamin.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7175,7 +7175,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;totalCarbohydrate&quot;, doubleVal(totalCarbohydrate.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7184,7 +7184,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;totalFat&quot;, doubleVal(totalFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7193,7 +7193,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;transFat&quot;, doubleVal(transFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7202,7 +7202,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;unsaturatedFat&quot;, doubleVal(unsaturatedFat.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7211,7 +7211,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminA&quot;, doubleVal(vitaminA.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7220,7 +7220,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminB12&quot;, doubleVal(vitaminB12.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7229,7 +7229,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminB6&quot;, doubleVal(vitaminB6.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7238,7 +7238,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminC&quot;, doubleVal(vitaminC.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7247,7 +7247,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminD&quot;, doubleVal(vitaminD.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7256,7 +7256,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminE&quot;, doubleVal(vitaminE.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7265,7 +7265,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;vitaminK&quot;, doubleVal(vitaminK.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7274,7 +7274,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;zinc&quot;, doubleVal(zinc.inGrams))"
         errorLine2="                        ~~~~~~~~~">
@@ -7283,7 +7283,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;mealType&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -7292,7 +7292,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    name?.let { putValues(&quot;name&quot;, stringVal(it)) }"
         errorLine2="                                ~~~~~~~~~">
@@ -7301,7 +7301,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7310,7 +7310,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;SleepSession&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -7319,7 +7319,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putSubTypeDataLists can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putSubTypeDataLists("
         errorLine2="                        ~~~~~~~~~~~~~~~~~~~">
@@ -7328,7 +7328,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataList.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                            DataProto.DataPoint.SubTypeDataList.newBuilder()"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -7337,7 +7337,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .addAllValues(stages.map { it.toProto() })"
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -7346,7 +7346,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                                .build()"
         errorLine2="                                 ~~~~~">
@@ -7355,7 +7355,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    title?.let { putValues(&quot;title&quot;, stringVal(it)) }"
         errorLine2="                                 ~~~~~~~~~">
@@ -7364,7 +7364,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    notes?.let { putValues(&quot;notes&quot;, stringVal(it)) }"
         errorLine2="                                 ~~~~~~~~~">
@@ -7373,7 +7373,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7382,7 +7382,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;SleepStage&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -7391,7 +7391,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                        putValues(&quot;stage&quot;, it)"
         errorLine2="                        ~~~~~~~~~">
@@ -7400,7 +7400,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7409,7 +7409,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;Steps&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -7418,7 +7418,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;count&quot;, longVal(count)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -7427,7 +7427,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7436,7 +7436,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;TotalCaloriesBurned&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -7445,7 +7445,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;energy&quot;, doubleVal(energy.inKilocalories)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -7454,7 +7454,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7463,7 +7463,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setDataType(protoDataType(&quot;WheelchairPushes&quot;))"
         errorLine2="                 ~~~~~~~~~~~">
@@ -7472,7 +7472,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .apply { putValues(&quot;count&quot;, longVal(count)) }"
         errorLine2="                         ~~~~~~~~~">
@@ -7481,7 +7481,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7490,7 +7490,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setDataType(protoDataType(dataTypeName = dataTypeName))"
         errorLine2="         ~~~~~~~~~~~">
@@ -7499,7 +7499,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addSeriesValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                addSeriesValues(getSeriesValue(sample))"
         errorLine2="                ~~~~~~~~~~~~~~~">
@@ -7508,7 +7508,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -7517,7 +7517,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.DataType.newBuilder().setName(dataTypeName).build()"
         errorLine2="                                                          ~~~~~">
@@ -7526,7 +7526,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setName can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.DataType.newBuilder().setName(dataTypeName).build()"
         errorLine2="                                    ~~~~~~~">
@@ -7535,7 +7535,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataType.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.DataType.newBuilder().setName(dataTypeName).build()"
         errorLine2="                       ~~~~~~~~~~">
@@ -7544,7 +7544,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        DataProto.DataPoint.newBuilder()"
         errorLine2="                            ~~~~~~~~~~">
@@ -7553,7 +7553,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInstantTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setInstantTimeMillis(time.toEpochMilli())"
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~">
@@ -7562,7 +7562,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    zoneOffset?.let { builder.setZoneOffsetSeconds(it.totalSeconds) }"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~">
@@ -7571,7 +7571,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataPoint.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        DataProto.DataPoint.newBuilder()"
         errorLine2="                            ~~~~~~~~~~">
@@ -7580,7 +7580,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setStartTimeMillis(startTime.toEpochMilli())"
         errorLine2="             ~~~~~~~~~~~~~~~~~~">
@@ -7589,7 +7589,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setEndTimeMillis(endTime.toEpochMilli())"
         errorLine2="             ~~~~~~~~~~~~~~~~">
@@ -7598,7 +7598,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    startZoneOffset?.let { builder.setStartZoneOffsetSeconds(it.totalSeconds) }"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7607,7 +7607,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndZoneOffsetSeconds can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    endZoneOffset?.let { builder.setEndZoneOffsetSeconds(it.totalSeconds) }"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7616,7 +7616,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        uid = metadata.id"
         errorLine2="        ~~~">
@@ -7625,7 +7625,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        uid = metadata.id"
         errorLine2="        ~~~">
@@ -7634,7 +7634,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigin ="
         errorLine2="        ~~~~~~~~~~">
@@ -7643,7 +7643,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDataOrigin can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        dataOrigin ="
         errorLine2="        ~~~~~~~~~~">
@@ -7652,7 +7652,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            DataProto.DataOrigin.newBuilder()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -7661,7 +7661,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DataOrigin.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            DataProto.DataOrigin.newBuilder()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -7670,7 +7670,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setApplicationId(metadata.dataOrigin.packageName)"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -7679,7 +7679,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setApplicationId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .setApplicationId(metadata.dataOrigin.packageName)"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -7688,7 +7688,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7697,7 +7697,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -7706,7 +7706,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUpdateTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        updateTimeMillis = metadata.lastModifiedTime.toEpochMilli()"
         errorLine2="        ~~~~~~~~~~~~~~~~">
@@ -7715,7 +7715,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUpdateTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        updateTimeMillis = metadata.lastModifiedTime.toEpochMilli()"
         errorLine2="        ~~~~~~~~~~~~~~~~">
@@ -7724,7 +7724,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClientId can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    metadata.clientRecordId?.let { setClientId(it) }"
         errorLine2="                                   ~~~~~~~~~~~">
@@ -7733,7 +7733,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClientVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        clientVersion = metadata.clientRecordVersion"
         errorLine2="        ~~~~~~~~~~~~~">
@@ -7742,7 +7742,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClientVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        clientVersion = metadata.clientRecordVersion"
         errorLine2="        ~~~~~~~~~~~~~">
@@ -7751,7 +7751,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDevice can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    metadata.device?.let { setDevice(it.toProto()) }"
         errorLine2="                           ~~~~~~~~~">
@@ -7760,7 +7760,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRecordingMethod can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        recordingMethod = metadata.recordingMethod"
         errorLine2="        ~~~~~~~~~~~~~~~">
@@ -7769,7 +7769,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRecordingMethod can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        recordingMethod = metadata.recordingMethod"
         errorLine2="        ~~~~~~~~~~~~~~~">
@@ -7778,7 +7778,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Device.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return DataProto.Device.newBuilder()"
         errorLine2="                            ~~~~~~~~~~">
@@ -7787,7 +7787,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setManufacturer can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.manufacturer?.let { setManufacturer(it) }"
         errorLine2="                                    ~~~~~~~~~~~~~~~">
@@ -7796,7 +7796,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModel can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.model?.let { setModel(it) }"
         errorLine2="                             ~~~~~~~~">
@@ -7805,7 +7805,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setType can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            setType(DEVICE_TYPE_INT_TO_STRING_MAP.getOrDefault(obj.type, DeviceTypes.UNKNOWN))"
         errorLine2="            ~~~~~~~">
@@ -7814,7 +7814,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -7823,7 +7823,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return DataProto.SubTypeDataValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -7832,7 +7832,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setStartTimeMillis(startTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~~~">
@@ -7841,7 +7841,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setEndTimeMillis(endTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -7850,7 +7850,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                putValues(&quot;stage&quot;, it)"
         errorLine2="                ~~~~~~~~~">
@@ -7859,7 +7859,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -7868,7 +7868,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return DataProto.SubTypeDataValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -7877,7 +7877,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setStartTimeMillis(startTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~~~">
@@ -7886,7 +7886,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setEndTimeMillis(endTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -7895,7 +7895,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .putValues(&quot;type&quot;, longVal(segmentType.toLong()))"
         errorLine2="         ~~~~~~~~~">
@@ -7904,7 +7904,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .putValues(&quot;reps&quot;, longVal(repetitions.toLong()))"
         errorLine2="         ~~~~~~~~~">
@@ -7913,7 +7913,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -7922,7 +7922,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return DataProto.SubTypeDataValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -7931,7 +7931,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setStartTimeMillis(startTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~~~">
@@ -7940,7 +7940,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setEndTimeMillis(endTime.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -7949,7 +7949,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .apply { length?.let { putValues(&quot;length&quot;, doubleVal(it.inMeters)) } }"
         errorLine2="                               ~~~~~~~~~">
@@ -7958,7 +7958,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -7967,7 +7967,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SubTypeDataValue.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return DataProto.SubTypeDataValue.newBuilder()"
         errorLine2="                                      ~~~~~~~~~~">
@@ -7976,7 +7976,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setStartTimeMillis(time.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~~~">
@@ -7985,7 +7985,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeMillis can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setEndTimeMillis(time.toEpochMilli())"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -7994,7 +7994,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .putValues(&quot;latitude&quot;, doubleVal(latitude))"
         errorLine2="         ~~~~~~~~~">
@@ -8003,7 +8003,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .putValues(&quot;longitude&quot;, doubleVal(longitude))"
         errorLine2="         ~~~~~~~~~">
@@ -8012,7 +8012,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            horizontalAccuracy?.let { putValues(&quot;horizontal_accuracy&quot;, doubleVal(it.inMeters)) }"
         errorLine2="                                      ~~~~~~~~~">
@@ -8021,7 +8021,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            verticalAccuracy?.let { putValues(&quot;vertical_accuracy&quot;, doubleVal(it.inMeters)) }"
         errorLine2="                                    ~~~~~~~~~">
@@ -8030,7 +8030,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putValues can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            altitude?.let { putValues(&quot;altitude&quot;, doubleVal(it.inMeters)) }"
         errorLine2="                            ~~~~~~~~~">
@@ -8039,7 +8039,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -8048,7 +8048,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RegisterForDataNotificationsRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    RequestProto.RegisterForDataNotificationsRequest.parseFrom(it)"
         errorLine2="                                                                     ~~~~~~~~~">
@@ -8057,7 +8057,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        RequestProto.RequestContext.newBuilder()"
         errorLine2="                                    ~~~~~~~~~~">
@@ -8066,7 +8066,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCallingPackage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setCallingPackage(obj.callingPackage)"
         errorLine2="             ~~~~~~~~~~~~~~~~~">
@@ -8075,7 +8075,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSdkVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setSdkVersion(obj.sdkVersion)"
         errorLine2="             ~~~~~~~~~~~~~">
@@ -8084,7 +8084,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPermissionToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .apply { obj.permissionToken?.let { setPermissionToken(it) } }"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
@@ -8093,7 +8093,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIsInForeground can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .setIsInForeground(obj.isInForeground)"
         errorLine2="             ~~~~~~~~~~~~~~~~~">
@@ -8102,7 +8102,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            .build()"
         errorLine2="             ~~~~~">
@@ -8111,7 +8111,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            RequestProto.RequestContext.parseFrom(it).run {"
         errorLine2="                                        ~~~~~~~~~">
@@ -8120,7 +8120,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getCallingPackage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                               ~~~~~~~~~~~~~~">
@@ -8129,7 +8129,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getCallingPackage can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                               ~~~~~~~~~~~~~~">
@@ -8138,7 +8138,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getIsInForeground can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~">
@@ -8147,7 +8147,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getIsInForeground can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                                                            ~~~~~~~~~~~~~~">
@@ -8156,7 +8156,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getPermissionToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                                           ~~~~~~~~~~~~~~~">
@@ -8165,7 +8165,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getPermissionToken can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                                           ~~~~~~~~~~~~~~~">
@@ -8174,7 +8174,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getSdkVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                               ~~~~~~~~~~">
@@ -8183,7 +8183,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RequestContext.getSdkVersion can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                RequestContext(callingPackage, sdkVersion, permissionToken, isInForeground)"
         errorLine2="                                               ~~~~~~~~~~">
@@ -8192,7 +8192,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeSpec.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    return TimeProto.TimeSpec.newBuilder()"
         errorLine2="                              ~~~~~~~~~~">
@@ -8201,7 +8201,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.startTime?.let { setStartTimeEpochMs(it.toEpochMilli()) }"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
@@ -8210,7 +8210,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndTimeEpochMs can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.endTime?.let { setEndTimeEpochMs(it.toEpochMilli()) }"
         errorLine2="                               ~~~~~~~~~~~~~~~~~">
@@ -8219,7 +8219,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.localStartTime?.let { setStartLocalDateTime(it.toString()) }"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -8228,7 +8228,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndLocalDateTime can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            obj.localEndTime?.let { setEndLocalDateTime(it.toString()) }"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
@@ -8237,7 +8237,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -8246,7 +8246,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UnregisterFromDataNotificationsRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                    RequestProto.UnregisterFromDataNotificationsRequest.parseFrom(it)"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -8255,7 +8255,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertDataRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return RequestProto.UpsertDataRequest.newBuilder()"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -8264,7 +8264,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addAllDataPoint can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .addAllDataPoint(obj.dataPoints)"
         errorLine2="                 ~~~~~~~~~~~~~~~">
@@ -8273,7 +8273,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                .build()"
         errorLine2="                 ~~~~~">
@@ -8282,7 +8282,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertDataRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="                val proto = RequestProto.UpsertDataRequest.parseFrom(it)"
         errorLine2="                                                           ~~~~~~~~~">
@@ -8291,7 +8291,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertDataRequest.getDataPointList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return UpsertDataRequest(proto.dataPointList)"
         errorLine2="                                           ~~~~~~~~~~~~~">
@@ -8300,7 +8300,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertDataRequest.getDataPointList can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="            return UpsertDataRequest(proto.dataPointList)"
         errorLine2="                                           ~~~~~~~~~~~~~">
@@ -8309,7 +8309,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="      return RequestProto.UpsertExerciseRouteRequest.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -8318,7 +8318,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSessionUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setSessionUid(obj.sessionUid)"
         errorLine2="         ~~~~~~~~~~~~~">
@@ -8327,7 +8327,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExerciseRoute can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .setExerciseRoute(obj.route)"
         errorLine2="         ~~~~~~~~~~~~~~~~">
@@ -8336,7 +8336,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        .build()"
         errorLine2="         ~~~~~">
@@ -8345,7 +8345,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.parseFrom can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="        val proto = RequestProto.UpsertExerciseRouteRequest.parseFrom(it)"
         errorLine2="                                                            ~~~~~~~~~">
@@ -8354,7 +8354,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.getExerciseRoute can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="      return UpsertExerciseRouteRequest(proto.sessionUid, proto.exerciseRoute)"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -8363,7 +8363,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.getExerciseRoute can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="      return UpsertExerciseRouteRequest(proto.sessionUid, proto.exerciseRoute)"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -8372,7 +8372,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.getSessionUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="      return UpsertExerciseRouteRequest(proto.sessionUid, proto.exerciseRoute)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -8381,7 +8381,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UpsertExerciseRouteRequest.getSessionUid can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="      return UpsertExerciseRouteRequest(proto.sessionUid, proto.exerciseRoute)"
         errorLine2="                                              ~~~~~~~~~~">
@@ -8390,7 +8390,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setLongVal(value).build()"
         errorLine2="                                                   ~~~~~">
@@ -8399,7 +8399,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLongVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setLongVal(value).build()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -8408,7 +8408,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setLongVal(value).build()"
         errorLine2="                    ~~~~~~~~~~">
@@ -8417,7 +8417,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setDoubleVal(value).build()"
         errorLine2="                                                     ~~~~~">
@@ -8426,7 +8426,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDoubleVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setDoubleVal(value).build()"
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -8435,7 +8435,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setDoubleVal(value).build()"
         errorLine2="                    ~~~~~~~~~~">
@@ -8444,7 +8444,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setStringVal(value).build()"
         errorLine2="                                                     ~~~~~">
@@ -8453,7 +8453,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setStringVal(value).build()"
         errorLine2="                                 ~~~~~~~~~~~~">
@@ -8462,7 +8462,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setStringVal(value).build()"
         errorLine2="                    ~~~~~~~~~~">
@@ -8471,7 +8471,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setEnumVal(value).build()"
         errorLine2="                                                   ~~~~~">
@@ -8480,7 +8480,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEnumVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setEnumVal(value).build()"
         errorLine2="                                 ~~~~~~~~~~">
@@ -8489,7 +8489,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setEnumVal(value).build()"
         errorLine2="                    ~~~~~~~~~~">
@@ -8498,7 +8498,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.build can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setBooleanVal(value).build()"
         errorLine2="                                                      ~~~~~">
@@ -8507,7 +8507,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBooleanVal can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setBooleanVal(value).build()"
         errorLine2="                                 ~~~~~~~~~~~~~">
@@ -8516,7 +8516,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Value.newBuilder can only be called from within the same library group (referenced groupId=`__local_aars__` from groupId=`androidx.health.connect`)"
         errorLine1="    DataProto.Value.newBuilder().setBooleanVal(value).build()"
         errorLine2="                    ~~~~~~~~~~">
diff --git a/leanback/leanback-preference/lint-baseline.xml b/leanback/leanback-preference/lint-baseline.xml
index a587861..b442697 100644
--- a/leanback/leanback-preference/lint-baseline.xml
+++ b/leanback/leanback-preference/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="PreferenceFragment.getCallbackFragment can only be called from within the same library (androidx.preference:preference)"
         errorLine1="    public Fragment getCallbackFragment() {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~">
diff --git a/lifecycle/integration-tests/kotlintestapp/lint-baseline.xml b/lifecycle/integration-tests/kotlintestapp/lint-baseline.xml
index a062d9e..bb00717d 100644
--- a/lifecycle/integration-tests/kotlintestapp/lint-baseline.xml
+++ b/lifecycle/integration-tests/kotlintestapp/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Lifecycle.internalScopeRef can only be accessed from within the same library group (referenced groupId=`androidx.lifecycle` from groupId=`androidx.lifecycle.integration-tests`)"
         errorLine1="        assertThat(owner.lifecycle.internalScopeRef.get()).isSameInstanceAs(scope)"
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Lifecycle.internalScopeRef can only be accessed from within the same library group (referenced groupId=`androidx.lifecycle` from groupId=`androidx.lifecycle.integration-tests`)"
         errorLine1="        assertThat(owner.lifecycle.internalScopeRef.get()).isSameInstanceAs(scope)"
         errorLine2="                                   ~~~~~~~~~~~~~~~~">
diff --git a/lifecycle/lifecycle-livedata-core/lint-baseline.xml b/lifecycle/lifecycle-livedata-core/lint-baseline.xml
deleted file mode 100644
index 4808888e..0000000
--- a/lifecycle/lifecycle-livedata-core/lint-baseline.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            new SafeIterableMap&lt;>();"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.iteratorWithAdditions can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="                        mObservers.iteratorWithAdditions(); iterator.hasNext(); ) {"
-        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                                          ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                                                    ~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                                          ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper existing = mObservers.putIfAbsent(observer, wrapper);"
-        errorLine2="                                                                    ~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper removed = mObservers.remove(observer);"
-        errorLine2="                                             ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ObserverWrapper removed = mObservers.remove(observer);"
-        errorLine2="                                                    ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().postToMainThread(mPostValueRunnable);"
-        errorLine2="                         ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.postToMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().postToMainThread(mPostValueRunnable);"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.postToMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().postToMainThread(mPostValueRunnable);"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.size can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        return mObservers.size() > 0;"
-        errorLine2="                          ~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        if (!ArchTaskExecutor.getInstance().isMainThread()) {"
-        errorLine2="                              ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.isMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        if (!ArchTaskExecutor.getInstance().isMainThread()) {"
-        errorLine2="                                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveData.java"/>
-    </issue>
-
-</issues>
diff --git a/lifecycle/lifecycle-livedata/lint-baseline.xml b/lifecycle/lifecycle-livedata/lint-baseline.xml
deleted file mode 100644
index 66dcbba..0000000
--- a/lifecycle/lifecycle-livedata/lint-baseline.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="    internal val executor: Executor = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/ComputableLiveData.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="    internal val executor: Executor = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/ComputableLiveData.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().executeOnMainThread(invalidationRunnable)"
-        errorLine2="                         ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/ComputableLiveData.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().executeOnMainThread(invalidationRunnable)"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/ComputableLiveData.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        ArchTaskExecutor.getInstance().executeOnMainThread(invalidationRunnable)"
-        errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/ComputableLiveData.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="    private SafeIterableMap&lt;LiveData&lt;?>, Source&lt;?>> mSources = new SafeIterableMap&lt;>();"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Source&lt;?> existing = mSources.putIfAbsent(source, e);"
-        errorLine2="                                      ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Source&lt;?> existing = mSources.putIfAbsent(source, e);"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Source&lt;?> existing = mSources.putIfAbsent(source, e);"
-        errorLine2="                                                          ~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Source&lt;?> source = mSources.remove(toRemote);"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        Source&lt;?> source = mSources.remove(toRemote);"
-        errorLine2="                                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/MediatorLiveData.java"/>
-    </issue>
-
-</issues>
diff --git a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml b/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
deleted file mode 100644
index 9767dc0..0000000
--- a/lifecycle/lifecycle-reactivestreams/lint-baseline.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance().executeOnMainThread("
-        errorLine2="                             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance().executeOnMainThread("
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="                Runnable {"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance().executeOnMainThread {"
-        errorLine2="                             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance().executeOnMainThread {"
-        errorLine2="                                           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance().executeOnMainThread {"
-        errorLine2="                                                               ^">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getInstance can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            ArchTaskExecutor.getInstance()"
-        errorLine2="                             ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="                .executeOnMainThread { // Errors should be handled upstream, so propagate as a crash."
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="TaskExecutor.executeOnMainThread can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="                .executeOnMainThread { // Errors should be handled upstream, so propagate as a crash."
-        errorLine2="                                     ^">
-        <location
-            file="src/main/java/androidx/lifecycle/LiveDataReactiveStreams.kt"/>
-    </issue>
-
-</issues>
diff --git a/lifecycle/lifecycle-runtime/lint-baseline.xml b/lifecycle/lifecycle-runtime/lint-baseline.xml
deleted file mode 100644
index 38b0dba..0000000
--- a/lifecycle/lifecycle-runtime/lint-baseline.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="    private var observerMap = FastSafeIterableMap&lt;LifecycleObserver, ObserverWithState>()"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            observerMap = FastSafeIterableMap()"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.size can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            if (observerMap.size() == 0) {"
-        errorLine2="                            ~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.eldest can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            val eldestObserverState = observerMap.eldest()!!.value.state"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.newest can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            val newestObserverState = observerMap.newest()!!.value.state"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.ceil can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        val map = observerMap.ceil(observer)"
-        errorLine2="                              ~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        val previous = observerMap.putIfAbsent(observer, statefulObserver)"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        val previous = observerMap.putIfAbsent(observer, statefulObserver)"
-        errorLine2="                                               ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.putIfAbsent can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        val previous = observerMap.putIfAbsent(observer, statefulObserver)"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.contains can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        while (statefulObserver.state &lt; targetState &amp;&amp; observerMap.contains(observer)"
-        errorLine2="                                                                   ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        observerMap.remove(observer)"
-        errorLine2="                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.remove can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        observerMap.remove(observer)"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.size can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            return observerMap.size()"
-        errorLine2="                               ~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.iteratorWithAdditions can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            observerMap.iteratorWithAdditions()"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.contains can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            while (observer.state &lt; state &amp;&amp; !newEventOccurred &amp;&amp; observerMap.contains(key)"
-        errorLine2="                                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.descendingIterator can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="        val descendingIterator = observerMap.descendingIterator()"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="FastSafeIterableMap.contains can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            while (observer.state > state &amp;&amp; !newEventOccurred &amp;&amp; observerMap.contains(key)"
-        errorLine2="                                                                              ~~~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.eldest can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            if (state &lt; observerMap.eldest()!!.value.state) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="SafeIterableMap.newest can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.lifecycle`)"
-        errorLine1="            val newest = observerMap.newest()"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/androidx/lifecycle/LifecycleRegistry.kt"/>
-    </issue>
-
-</issues>
diff --git a/media2/integration-tests/testapp/lint-baseline.xml b/media2/integration-tests/testapp/lint-baseline.xml
index 751410f..7db1f02 100644
--- a/media2/integration-tests/testapp/lint-baseline.xml
+++ b/media2/integration-tests/testapp/lint-baseline.xml
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaItem.getMediaId can only be called from within the same library group (referenced groupId=`androidx.media2` from groupId=`androidx.media2.integration-tests`)"
         errorLine1="                    &amp;&amp; TextUtils.equals(currentItem.getMediaId(), mUri.toString())"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BaseResult.RESULT_SUCCESS can only be accessed from within the same library group (referenced groupId=`androidx.media2` from groupId=`androidx.media2.integration-tests`)"
         errorLine1="                if (playerResult.getResultCode() != SessionPlayer.PlayerResult.RESULT_SUCCESS) {"
         errorLine2="                                                                               ~~~~~~~~~~~~~~">
diff --git a/media2/media2-common/lint-baseline.xml b/media2/media2-common/lint-baseline.xml
index 34f7604..37d6a19 100644
--- a/media2/media2-common/lint-baseline.xml
+++ b/media2/media2-common/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ParcelImpl can only be accessed from within the same library (androidx.versionedparcelable:versionedparcelable)"
         errorLine1="        return (ParcelImpl) ParcelUtils.toParcelable(item);"
         errorLine2="                ~~~~~~~~~~">
@@ -11,6 +11,42 @@
     </issue>
 
     <issue
+        id="RestrictedApiAndroidX"
+        message="ParcelImpl can only be accessed from within the same library (androidx.versionedparcelable:versionedparcelable)"
+        errorLine1="    private static class MediaItemParcelImpl extends ParcelImpl {"
+        errorLine2="                                                     ~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/common/MediaParcelUtils.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ParcelImpl can only be called from within the same library (androidx.versionedparcelable:versionedparcelable)"
+        errorLine1="            super(new MediaItem(item));"
+        errorLine2="            ~~~~~">
+        <location
+            file="src/main/java/androidx/media2/common/MediaParcelUtils.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ParcelImpl can only be called from within the same library (androidx.versionedparcelable:versionedparcelable)"
+        errorLine1="            super(new MediaItem(item));"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/common/MediaParcelUtils.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ParcelImpl.getVersionedParcel can only be called from within the same library (androidx.versionedparcelable:versionedparcelable)"
+        errorLine1="        public MediaItem getVersionedParcel() {"
+        errorLine2="                         ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/media2/common/MediaParcelUtils.java"/>
+    </issue>
+
+    <issue
         id="KotlinPropertyAccess"
         message="This method should be called `getMediaItem` such that `mediaItem` can be accessed as a property from Kotlin; see https://android.github.io/kotlin-guides/interop.html#property-prefixes"
         errorLine1="    public abstract MediaItem getCurrentMediaItem();"
diff --git a/media2/media2-session/lint-baseline.xml b/media2/media2-session/lint-baseline.xml
index da49040..089c752 100644
--- a/media2/media2-session/lint-baseline.xml
+++ b/media2/media2-session/lint-baseline.xml
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaBrowserServiceCompat.onSubscribe can only be called from within the same library (androidx.media:media)"
         errorLine1="    public void onSubscribe(final String id, final Bundle option) {"
         errorLine2="                ~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaBrowserServiceCompat.onUnsubscribe can only be called from within the same library (androidx.media:media)"
         errorLine1="    public void onUnsubscribe(final String id) {"
         errorLine2="                ~~~~~~~~~~~~~">
diff --git a/navigation/navigation-fragment/lint-baseline.xml b/navigation/navigation-fragment/lint-baseline.xml
index 69f70619..f8e3e41 100644
--- a/navigation/navigation-fragment/lint-baseline.xml
+++ b/navigation/navigation-fragment/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                    if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                    if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="        if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="            if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                    if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                            if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="                        if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="        if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FragmentManager.isLoggingEnabled can only be called from within the same library (androidx.fragment:fragment)"
         errorLine1="        if (FragmentManager.isLoggingEnabled(Log.VERBOSE)) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
diff --git a/paging/paging-runtime/lint-baseline.xml b/paging/paging-runtime/lint-baseline.xml
deleted file mode 100644
index 208e816..0000000
--- a/paging/paging-runtime/lint-baseline.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getMainThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    internal var mainThreadExecutor = ArchTaskExecutor.getMainThreadExecutor()"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/AsyncPagedListDiffer.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    fetchExecutor: Executor = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    fetchExecutor: Executor = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    fetchDispatcher: CoroutineDispatcher = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getMainThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="        ArchTaskExecutor.getMainThreadExecutor().asCoroutineDispatcher(),"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    fetchDispatcher: CoroutineDispatcher = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getMainThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="        ArchTaskExecutor.getMainThreadExecutor().asCoroutineDispatcher(),"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedList.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="    private var fetchDispatcher = ArchTaskExecutor.getIOThreadExecutor().asCoroutineDispatcher()"
-        errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedListBuilder.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getMainThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.paging`)"
-        errorLine1="            ArchTaskExecutor.getMainThreadExecutor().asCoroutineDispatcher(),"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/paging/LivePagedListBuilder.kt"/>
-    </issue>
-
-</issues>
diff --git a/room/integration-tests/kotlintestapp/lint-baseline.xml b/room/integration-tests/kotlintestapp/lint-baseline.xml
index e356edd..ccd47d1 100644
--- a/room/integration-tests/kotlintestapp/lint-baseline.xml
+++ b/room/integration-tests/kotlintestapp/lint-baseline.xml
@@ -64,31 +64,4 @@
             file="src/androidTest/java/androidx/room/integration/kotlintestapp/test/Rx3PagingSourceTest.kt"/>
     </issue>
 
-    <issue
-        id="RestrictedApi"
-        message="CursorUtil.useCursor can only be called from within the same library group prefix (referenced groupId=`androidx.room` with prefix androidx from groupId=`androidx.room.integration-tests`)"
-        errorLine1="                getUsers().useCursor {"
-        errorLine2="                ~~~~~~~~">
-        <location
-            file="src/androidTestWithKspGenJava/java/androidx/room/integration/kotlintestapp/NullabilityAwareTypeConversionTest.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="CursorUtil.useCursor can only be called from within the same library group prefix (referenced groupId=`androidx.room` with prefix androidx from groupId=`androidx.room.integration-tests`)"
-        errorLine1="                getUsers().useCursor {"
-        errorLine2="                           ~~~~~~~~~">
-        <location
-            file="src/androidTestWithKspGenJava/java/androidx/room/integration/kotlintestapp/NullabilityAwareTypeConversionTest.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="CursorUtil.useCursor can only be called from within the same library group prefix (referenced groupId=`androidx.room` with prefix androidx from groupId=`androidx.room.integration-tests`)"
-        errorLine1="                getUsers().useCursor {"
-        errorLine2="                                     ^">
-        <location
-            file="src/androidTestWithKspGenJava/java/androidx/room/integration/kotlintestapp/NullabilityAwareTypeConversionTest.kt"/>
-    </issue>
-
 </issues>
diff --git a/room/room-guava/lint-baseline.xml b/room/room-guava/lint-baseline.xml
index 02cd583..4e529ae 100644
--- a/room/room-guava/lint-baseline.xml
+++ b/room/room-guava/lint-baseline.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
+        errorLine1="                        SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal);"
+        errorLine2="                                                      ~~~~~~">
+        <location
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
+        errorLine1="                        SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal);"
+        errorLine2="                                                             ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/room/guava/GuavaRoom.java"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/room/room-ktx/lint-baseline.xml b/room/room-ktx/lint-baseline.xml
index ff52e62..99873f6 100644
--- a/room/room-ktx/lint-baseline.xml
+++ b/room/room-ktx/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                            SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal)"
         errorLine2="                                                          ~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                            SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal)"
         errorLine2="                                                          ~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                            SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal)"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api16Impl.cancel can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                            SupportSQLiteCompat.Api16Impl.cancel(cancellationSignal)"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
diff --git a/room/room-runtime/lint-baseline.xml b/room/room-runtime/lint-baseline.xml
index 1998151..c295a53 100644
--- a/room/room-runtime/lint-baseline.xml
+++ b/room/room-runtime/lint-baseline.xml
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.setNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.setNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
         errorLine2="                                                              ~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.setNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
         errorLine2="                                                                        ~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.setNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api29Impl.setNotificationUris(delegate, cr, uris)"
         errorLine2="                                                                            ~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api19Impl.getNotificationUri can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            return SupportSQLiteCompat.Api19Impl.getNotificationUri(delegate)"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api19Impl.getNotificationUri can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            return SupportSQLiteCompat.Api19Impl.getNotificationUri(delegate)"
         errorLine2="                                                                    ~~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.getNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            return SupportSQLiteCompat.Api29Impl.getNotificationUris(delegate)"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api29Impl.getNotificationUris can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            return SupportSQLiteCompat.Api29Impl.getNotificationUris(delegate)"
         errorLine2="                                                                     ~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api23Impl.setExtras can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
         errorLine2="                                          ~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api23Impl.setExtras can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
         errorLine2="                                                    ~~~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api23Impl.setExtras can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            SupportSQLiteCompat.Api23Impl.setExtras(delegate, extras)"
         errorLine2="                                                              ~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api16Impl.createCancellationSignal can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="        SupportSQLiteCompat.Api16Impl.createCancellationSignal()"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -272,16 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="SafeIterableMap can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.room`)"
-        errorLine1="    internal val observerMap = SafeIterableMap&lt;Observer, ObserverWrapper>()"
-        errorLine2="                               ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/InvalidationTracker.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api19Impl.isLowRamDevice can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                SupportSQLiteCompat.Api19Impl.isLowRamDevice(activityManager)"
         errorLine2="                                              ~~~~~~~~~~~~~~">
@@ -290,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Api19Impl.isLowRamDevice can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="                SupportSQLiteCompat.Api19Impl.isLowRamDevice(activityManager)"
         errorLine2="                                                             ~~~~~~~~~~~~~~~">
@@ -299,16 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ArchTaskExecutor.getIOThreadExecutor can only be called from within the same library group prefix (referenced groupId=`androidx.arch.core` with prefix androidx.arch from groupId=`androidx.room`)"
-        errorLine1="                transactionExecutor = ArchTaskExecutor.getIOThreadExecutor()"
-        errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/room/RoomDatabase.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="        val copyLock = ProcessLock("
         errorLine2="                       ~~~~~~~~~~~">
@@ -317,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            name,"
         errorLine2="            ~~~~">
@@ -326,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProcessLock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            context.filesDir,"
         errorLine2="            ~~~~~~~~~~~~~~~~">
@@ -335,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProcessLock.lock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            copyLock.lock()"
         errorLine2="                     ~~~~">
@@ -344,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProcessLock.unlock can only be called from within the same library group (referenced groupId=`androidx.sqlite` from groupId=`androidx.room`)"
         errorLine1="            copyLock.unlock()"
         errorLine2="                     ~~~~~~">
diff --git a/samples/AndroidXDemos/lint-baseline.xml b/samples/AndroidXDemos/lint-baseline.xml
index 756fa6d..0866c46 100644
--- a/samples/AndroidXDemos/lint-baseline.xml
+++ b/samples/AndroidXDemos/lint-baseline.xml
@@ -338,7 +338,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx`)"
         errorLine1="        checkArgument(selectionTracker != null);"
         errorLine2="        ~~~~~~~~~~~~~">
@@ -347,7 +347,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx`)"
         errorLine1="        checkArgument(selectionTracker != null);"
         errorLine2="        ~~~~~~~~~~~~~">
@@ -356,7 +356,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx`)"
         errorLine1="        checkArgument(tracker != null);"
         errorLine2="        ~~~~~~~~~~~~~">
@@ -365,7 +365,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SelectionObserver.onSelectionCleared can only be called from within the same library (androidx.recyclerview:recyclerview-selection)"
         errorLine1="                    public void onSelectionCleared() {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~">
@@ -374,7 +374,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx`)"
         errorLine1="        Preconditions.checkArgument(group != null);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -383,7 +383,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkArgument can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx`)"
         errorLine1="        Preconditions.checkArgument(isCheese(uri));"
         errorLine2="                      ~~~~~~~~~~~~~">
diff --git a/samples/MediaRoutingDemo/lint-baseline.xml b/samples/MediaRoutingDemo/lint-baseline.xml
index 35e82c3..96b93f7 100644
--- a/samples/MediaRoutingDemo/lint-baseline.xml
+++ b/samples/MediaRoutingDemo/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-beta01)" variant="all" version="8.2.0-beta01">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RouteInfo.isDefaultOrBluetooth can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="            if (!routeInfo.isDefaultOrBluetooth()) {"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RouteInfo.DEVICE_TYPE_BLUETOOTH can only be accessed from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="        BLUETOOTH(MediaRouter.RouteInfo.DEVICE_TYPE_BLUETOOTH),"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="RouteInfo.DEVICE_TYPE_UNKNOWN can only be accessed from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="        UNKNOWN(MediaRouter.RouteInfo.DEVICE_TYPE_UNKNOWN);"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteProvider.onCreateRouteController can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="    public RouteController onCreateRouteController(@NonNull String routeId,"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="        if (initialRoute.getGroupMemberIds().isEmpty()) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="            memberIds.addAll(initialRoute.getGroupMemberIds());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="                            .addGroupMemberIds(memberIds);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="            for (String memberRouteId : routeDescriptor.getGroupMemberIds()) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.clearGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="                            .clearGroupMemberIds();"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addGroupMemberId can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="                groupDescriptorBuilder.addGroupMemberId(memberRouteId);"
         errorLine2="                                       ~~~~~~~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="                if (!routeDescriptor.getGroupMemberIds().isEmpty()"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="                        &amp;&amp; mMemberRouteIds.containsAll(routeDescriptor.getGroupMemberIds())) {"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="            if (routeDescriptor.getGroupMemberIds().isEmpty()) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaRouteDescriptor.getGroupMemberIds can only be called from within the same library (androidx.mediarouter:mediarouter)"
         errorLine1="            for (String routeId : routeDescriptor.getGroupMemberIds()) {"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~">
diff --git a/samples/SupportEmojiDemos/lint-baseline.xml b/samples/SupportEmojiDemos/lint-baseline.xml
index 747d878..67b1517 100644
--- a/samples/SupportEmojiDemos/lint-baseline.xml
+++ b/samples/SupportEmojiDemos/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="BanSynchronizedMethods"
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmojiCompat.reset can only be called from within the same library (androidx.emoji2:emoji2)"
         errorLine1="        EmojiCompat.reset(config);"
         errorLine2="                    ~~~~~">
diff --git a/samples/SupportLeanbackDemos/lint-baseline.xml b/samples/SupportLeanbackDemos/lint-baseline.xml
index bee5f2e..213e53b 100644
--- a/samples/SupportLeanbackDemos/lint-baseline.xml
+++ b/samples/SupportLeanbackDemos/lint-baseline.xml
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GuidedStepFragment.SLIDE_FROM_BOTTOM can only be accessed from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="            setEntranceTransitionType(GuidedStepFragment.SLIDE_FROM_BOTTOM);"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GuidedStepFragment.setEntranceTransitionType can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="            setEntranceTransitionType(GuidedStepFragment.SLIDE_FROM_BOTTOM);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GuidedStepSupportFragment.SLIDE_FROM_BOTTOM can only be accessed from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="            setEntranceTransitionType(GuidedStepSupportFragment.SLIDE_FROM_BOTTOM);"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="GuidedStepSupportFragment.setEntranceTransitionType can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="            setEntranceTransitionType(GuidedStepSupportFragment.SLIDE_FROM_BOTTOM);"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        MediaPlayerGlue mediaPlayerGlue = new MediaPlayerGlue(getActivity());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.REPEAT_ONE can only be accessed from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMode(MediaPlayerGlue.REPEAT_ONE);"
         errorLine2="                                                ~~~~~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setMode can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMode(MediaPlayerGlue.REPEAT_ONE);"
         errorLine2="                        ~~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setArtist can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setArtist(&quot;A Googler&quot;);"
         errorLine2="                        ~~~~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setTitle can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setTitle(&quot;Diving with Sharks Trailer&quot;);"
         errorLine2="                        ~~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setMediaSource can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMediaSource(Uri.parse(&quot;android.resource://com.example.android.leanback/&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        MediaPlayerGlue mediaPlayerGlue = new MediaPlayerGlue(getActivity());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.REPEAT_ONE can only be accessed from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMode(MediaPlayerGlue.REPEAT_ONE);"
         errorLine2="                                                ~~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setMode can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMode(MediaPlayerGlue.REPEAT_ONE);"
         errorLine2="                        ~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setArtist can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setArtist(&quot;A Googler&quot;);"
         errorLine2="                        ~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setTitle can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setTitle(&quot;Diving with Sharks Trailer&quot;);"
         errorLine2="                        ~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MediaPlayerGlue.setMediaSource can only be called from within the same library group prefix (referenced groupId=`androidx.leanback` with prefix androidx from groupId=`androidx`)"
         errorLine1="        mediaPlayerGlue.setMediaSource(Uri.parse(&quot;android.resource://com.example.android.leanback/&quot;"
         errorLine2="                        ~~~~~~~~~~~~~~">
diff --git a/samples/SupportSliceDemos/lint-baseline.xml b/samples/SupportSliceDemos/lint-baseline.xml
index 1a9fe29..9f29484 100644
--- a/samples/SupportSliceDemos/lint-baseline.xml
+++ b/samples/SupportSliceDemos/lint-baseline.xml
@@ -1,5 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="cli" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ListContent can only be called from within the same library (androidx.slice:slice-view)"
+        errorLine1="        ListContent content = new ListContent(loadedSlice);"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ListContent can only be called from within the same library (androidx.slice:slice-view)"
+        errorLine1="        ListContent content = new ListContent(loadedSlice);"
+        errorLine2="                                              ~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ListContent.getHeader can only be called from within the same library (androidx.slice:slice-view)"
+        errorLine1="        SliceItem headerItem = content.getHeader() != null"
+        errorLine2="                                       ~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="ListContent.getHeader can only be called from within the same library (androidx.slice:slice-view)"
+        errorLine1="                ? content.getHeader().getSliceItem() : null;"
+        errorLine2="                          ~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceContent.getSliceItem can only be called from within the same library (androidx.slice:slice-view)"
+        errorLine1="                ? content.getHeader().getSliceItem() : null;"
+        errorLine2="                                      ~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);"
+        errorLine2="                                     ~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);"
+        errorLine2="                                          ~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);"
+        errorLine2="                                                      ~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);"
+        errorLine2="                                                                   ~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);"
+        errorLine2="                                                                               ~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);"
+        errorLine2="                           ~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);"
+        errorLine2="                                ~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);"
+        errorLine2="                                            ~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);"
+        errorLine2="                                                         ~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);"
+        errorLine2="                                                                     ~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT);"
+        errorLine2="                           ~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT);"
+        errorLine2="                                ~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="SliceQuery.find can only be called from within the same library group prefix (referenced groupId=`androidx.slice` with prefix androidx from groupId=`androidx`)"
+        errorLine1="        title = SliceQuery.find(headerItem, FORMAT_TEXT);"
+        errorLine2="                                            ~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/slice/demos/SliceSelectionDialog.java"/>
+    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/testutils/testutils-espresso/lint-baseline.xml b/testutils/testutils-espresso/lint-baseline.xml
index 806832a..d8f96fd 100644
--- a/testutils/testutils-espresso/lint-baseline.xml
+++ b/testutils/testutils-espresso/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="UiThreadStatement.runOnUiThread can only be called from within the same library (androidx.test:runner)"
         errorLine1="    if (requestLayout) UiThreadStatement.runOnUiThread { requestLayout() }"
         errorLine2="                                         ~~~~~~~~~~~~~">
diff --git a/testutils/testutils-macrobenchmark/lint-baseline.xml b/testutils/testutils-macrobenchmark/lint-baseline.xml
index 814f280..9a090d91 100644
--- a/testutils/testutils-macrobenchmark/lint-baseline.xml
+++ b/testutils/testutils-macrobenchmark/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CompilationModeKt.isSupportedWithVmSettings can only be called from within the same library group prefix (referenced groupId=`androidx.benchmark` with prefix androidx from groupId=`androidx`)"
         errorLine1="            if (compilationMode.isSupportedWithVmSettings()) {"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="CompilationModeKt.isSupportedWithVmSettings can only be called from within the same library group prefix (referenced groupId=`androidx.benchmark` with prefix androidx from groupId=`androidx`)"
         errorLine1="        if (compilationMode.isSupportedWithVmSettings()) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/transition/transition/lint-baseline.xml b/transition/transition/lint-baseline.xml
index 0e4b999..fba6654 100644
--- a/transition/transition/lint-baseline.xml
+++ b/transition/transition/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha08" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha08)" variant="all" version="7.4.0-alpha08">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="ResourceType"
@@ -217,4 +217,13 @@
             file="src/main/java/androidx/transition/Styleable.java"/>
     </issue>
 
+    <issue
+        id="RestrictedApiAndroidX"
+        message="PathParser.createPathFromPathData can only be called from within the same library (androidx.core:core)"
+        errorLine1="            Path pattern = PathParser.createPathFromPathData(pathData);"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/androidx/transition/PatternPathMotion.java"/>
+    </issue>
+
 </issues>
diff --git a/wear/protolayout/protolayout-renderer/lint-baseline.xml b/wear/protolayout/protolayout-renderer/lint-baseline.xml
index 316b2b8..d8b34d6 100644
--- a/wear/protolayout/protolayout-renderer/lint-baseline.xml
+++ b/wear/protolayout/protolayout-renderer/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (resource.getAnimatedImageFormat() == AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (resource.getAnimatedImageFormat() == AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD) {"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mAndroidResources.getDrawable(resource.getResourceId(), /* theme= */ null);"
         errorLine2="                                                          ~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByContentUri.getContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        Uri resourceUri = Uri.parse(resource.getContentUri());"
         errorLine2="                                             ~~~~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByContentUri.getContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    &quot;Provided content URI &quot; + resource.getContentUri() + &quot; cannot be opened&quot;);"
         errorLine2="                                                       ~~~~~~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByContentUri.getContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        &quot;Cannot read from URI &quot; + resource.getContentUri());"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByContentUri.getContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    &quot;Cannot open file for URI &quot; + resource.getContentUri(), ex);"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByContentUri.getContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    &quot;Error while reading URI &quot; + resource.getContentUri(), ex);"
         errorLine2="                                                          ~~~~~~~~~~~~~">
@@ -74,43 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="        ResolvableFuture&lt;Drawable> resolvableFuture = ResolvableFuture.create();"
-        errorLine2="                                                                       ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/DefaultAndroidImageResourceByContentUriResolver.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        resolvableFuture.set(d);"
-        errorLine2="                                         ~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/DefaultAndroidImageResourceByContentUriResolver.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        resolvableFuture.set(d);"
-        errorLine2="                                             ~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/DefaultAndroidImageResourceByContentUriResolver.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        resolvableFuture.setException(ex);"
-        errorLine2="                                         ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/DefaultAndroidImageResourceByContentUriResolver.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mAndroidResources.getDrawable(resource.getResourceId(), /* theme= */ null);"
         errorLine2="                                                          ~~~~~~~~~~~~~">
@@ -119,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (resource.getAnimatedImageFormat() == AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~">
@@ -128,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (resource.getAnimatedImageFormat() == AnimatedImageFormat.ANIMATED_IMAGE_FORMAT_AVD) {"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -137,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                final XmlPullParser parser = mAndroidResources.getXml(resource.getResourceId());"
         errorLine2="                                                                               ~~~~~~~~~~~~~">
@@ -146,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_RGB_565 can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_RGB_565"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~">
@@ -155,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_RGB_565"
         errorLine2="                        ~~~~~~~~~">
@@ -164,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_ARGB_8888 can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_ARGB_8888) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
@@ -173,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_ARGB_8888) {"
         errorLine2="                               ~~~~~~~~~">
@@ -182,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        } else if (inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_UNDEFINED) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
@@ -191,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        } else if (inlineImage.getFormat() == ImageFormat.IMAGE_FORMAT_UNDEFINED) {"
         errorLine2="                               ~~~~~~~~~">
@@ -200,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_RGB_565 can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE_FORMAT_RGB_565:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -209,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_ARGB_8888 can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE_FORMAT_ARGB_8888:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -218,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.IMAGE_FORMAT_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE_FORMAT_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -227,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -236,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        Config config = imageFormatToBitmapConfig(inlineImage.getFormat());"
         errorLine2="                                                              ~~~~~~~~~">
@@ -245,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int widthPx = inlineImage.getWidthPx();"
         errorLine2="                                  ~~~~~~~~~~">
@@ -254,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int heightPx = inlineImage.getHeightPx();"
         errorLine2="                                   ~~~~~~~~~~~">
@@ -263,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (inlineImage.getData().size() != expectedDataSize) {"
         errorLine2="                        ~~~~~~~">
@@ -272,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        bitmap.copyPixelsFromBuffer(ByteBuffer.wrap(inlineImage.getData().toByteArray()));"
         errorLine2="                                                                ~~~~~~~">
@@ -281,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        inlineImage.getData().toByteArray(), 0, inlineImage.getData().size());"
         errorLine2="                                    ~~~~~~~">
@@ -290,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        inlineImage.getData().toByteArray(), 0, inlineImage.getData().size());"
         errorLine2="                                                                            ~~~~~~~">
@@ -299,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                bitmap, inlineImage.getWidthPx(), inlineImage.getHeightPx(), /* filter= */ true);"
         errorLine2="                                                              ~~~~~~~~~~~">
@@ -308,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                bitmap, inlineImage.getWidthPx(), inlineImage.getHeightPx(), /* filter= */ true);"
         errorLine2="                                    ~~~~~~~~~~">
@@ -317,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (entry.mTrigger.getInnerCase() != triggerCase"
         errorLine2="                               ~~~~~~~~~~~~">
@@ -326,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_ONCE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if ((triggerCase == InnerCase.ON_VISIBLE_ONCE_TRIGGER"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -335,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_LOAD_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            || triggerCase == InnerCase.ON_LOAD_TRIGGER)"
         errorLine2="                                                        ~~~~~~~~~~~~~~~">
@@ -344,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (entry.mTrigger.getInnerCase() == triggerCase &amp;&amp; entry.mDrawable != null) {"
         errorLine2="                               ~~~~~~~~~~~~">
@@ -353,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (entry.mDrawable.isRunning() &amp;&amp; entry.mTrigger.getInnerCase() == triggerCase) {"
         errorLine2="                                                              ~~~~~~~~~~~~">
@@ -362,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.values can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        for (InnerCase triggerCase : InnerCase.values()) {"
         errorLine2="                                               ~~~~~~">
@@ -371,25 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            checkNotNull(mPosIdToTreeNode.remove(posId)).destroy();"
-        errorLine2="            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/PositionIdTree.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            checkNotNull(mPosIdToTreeNode.remove(posId)).destroy();"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/PositionIdTree.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!layout.getFingerprint().hasRoot()) {"
         errorLine2="                    ~~~~~~~~~~~~~~">
@@ -398,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.hasRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!layout.getFingerprint().hasRoot()) {"
         errorLine2="                                     ~~~~~~~">
@@ -407,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        NodeFingerprint prevRootFingerprint = prevTreeFingerprint.getRoot();"
         errorLine2="                                                                  ~~~~~~~">
@@ -416,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layout.getRoot(), layout.getFingerprint().getRoot(), ROOT_NODE_ID);"
         errorLine2="                                                 ~~~~~~~~~~~~~~">
@@ -425,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layout.getRoot(), layout.getFingerprint().getRoot(), ROOT_NODE_ID);"
         errorLine2="                               ~~~~~~~">
@@ -434,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layout.getRoot(), layout.getFingerprint().getRoot(), ROOT_NODE_ID);"
         errorLine2="                                                                  ~~~~~~~">
@@ -443,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        NodeFingerprint prev = first.getRoot();"
         errorLine2="                                     ~~~~~~~">
@@ -452,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        NodeFingerprint current = second.getRoot();"
         errorLine2="                                         ~~~~~~~">
@@ -461,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return current.getSelfTypeValue() == prev.getSelfTypeValue()"
         errorLine2="                       ~~~~~~~~~~~~~~~~">
@@ -470,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return current.getSelfTypeValue() == prev.getSelfTypeValue()"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~">
@@ -479,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; current.getSelfPropsValue() == prev.getSelfPropsValue()"
         errorLine2="                           ~~~~~~~~~~~~~~~~~">
@@ -488,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; current.getSelfPropsValue() == prev.getSelfPropsValue()"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~">
@@ -497,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; current.getChildNodesValue() == prev.getChildNodesValue();"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~">
@@ -506,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; current.getChildNodesValue() == prev.getChildNodesValue();"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
@@ -515,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (prevNode.getSelfTypeValue() != node.getSelfTypeValue()) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
@@ -524,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (prevNode.getSelfTypeValue() != node.getSelfTypeValue()) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~">
@@ -533,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (node.getSelfPropsValue() == DISCARDED_FINGERPRINT_VALUE"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
@@ -542,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; node.getChildNodesValue() == DISCARDED_FINGERPRINT_VALUE) {"
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
@@ -551,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (node.getChildNodesCount() == 0) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
@@ -560,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (prevNode.getChildNodesCount() != node.getChildNodesCount()) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
@@ -569,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (prevNode.getChildNodesCount() != node.getChildNodesCount()) {"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~">
@@ -578,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                node.getSelfPropsValue() == DISCARDED_FINGERPRINT_VALUE"
         errorLine2="                     ~~~~~~~~~~~~~~~~~">
@@ -587,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        || prevNode.getSelfPropsValue() != node.getSelfPropsValue();"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -596,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        || prevNode.getSelfPropsValue() != node.getSelfPropsValue();"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~">
@@ -605,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                node.getChildNodesValue() == DISCARDED_FINGERPRINT_VALUE"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~">
@@ -614,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        || prevNode.getChildNodesValue() != node.getChildNodesValue();"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~">
@@ -623,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        || prevNode.getChildNodesValue() != node.getChildNodesValue();"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
@@ -632,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        checkState(childList.size() == prevNodeFingerprint.getChildNodesCount());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~">
@@ -641,16 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkState can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="        checkState(childList.size() == prevNodeFingerprint.getChildNodesCount());"
-        errorLine2="        ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/common/ProtoLayoutDiffer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodes can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            NodeFingerprint prevChildNodeFingerprint = prevNodeFingerprint.getChildNodes(i);"
         errorLine2="                                                                           ~~~~~~~~~~~~~">
@@ -659,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (layoutElement.getInnerCase()) {"
         errorLine2="                              ~~~~~~~~~~~~">
@@ -668,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.BOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case BOX:"
         errorLine2="                 ~~~">
@@ -677,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getBox().getContentsList(),"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
@@ -686,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getBox().getContentsList(),"
         errorLine2="                                      ~~~~~~">
@@ -695,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        fingerprint.getChildNodesList(),"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -704,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.COLUMN can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case COLUMN:"
         errorLine2="                 ~~~~~~">
@@ -713,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getColumn().getContentsList(),"
         errorLine2="                                                  ~~~~~~~~~~~~~~~">
@@ -722,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getColumn().getContentsList(),"
         errorLine2="                                      ~~~~~~~~~">
@@ -731,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        fingerprint.getChildNodesList(),"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -740,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ROW can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ROW:"
         errorLine2="                 ~~~">
@@ -749,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getRow().getContentsList(),"
         errorLine2="                                      ~~~~~~">
@@ -758,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getRow().getContentsList(),"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
@@ -767,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        fingerprint.getChildNodesList(),"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -776,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ARC can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC:"
         errorLine2="                 ~~~">
@@ -785,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getArc().getContentsList(),"
         errorLine2="                                               ~~~~~~~~~~~~~~~">
@@ -794,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        layoutElement.getArc().getContentsList(),"
         errorLine2="                                      ~~~~~~">
@@ -803,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.getChildNodesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        fingerprint.getChildNodesList(),"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~">
@@ -812,25 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                        checkNotNull(animatingNode.getValue()), associatedView);"
-        errorLine2="                                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                        checkNotNull(animatingNode.getValue()), associatedView);"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.hasExitTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        &amp;&amp; animatedVisibility.hasExitTransition();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~">
@@ -839,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.getExitTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        checkNotNull(affectedNode.getAnimatedVisibility()).getExitTransition());"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~">
@@ -848,25 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(affectedNode.getAnimatedVisibility()).getExitTransition());"
-        errorLine2="                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(affectedNode.getAnimatedVisibility()).getExitTransition());"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.hasEnterTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                            &amp;&amp; animatedVisibility.hasEnterTransition();"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -875,25 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                            checkNotNull(affectedNode.getAnimatedVisibility())"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                            checkNotNull(affectedNode.getAnimatedVisibility())"
-        errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.getEnterTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    .getEnterTransition());"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
@@ -902,25 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                    checkNotNull(animatingNode.getValue()), associatedView);"
-        errorLine2="                                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                    checkNotNull(animatingNode.getValue()), associatedView);"
-        errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/dynamicdata/ProtoLayoutDynamicDataPipeline.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            dpProp.getDynamicValue(), consumer);"
         errorLine2="                                   ~~~~~~~~~~~~~~~">
@@ -929,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            degreesProp.getDynamicValue(), consumer);"
         errorLine2="                                        ~~~~~~~~~~~~~~~">
@@ -938,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            colorProp.getDynamicValue(), consumer);"
         errorLine2="                                      ~~~~~~~~~~~~~~~">
@@ -947,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_CONDITION_MET_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (trigger.getInnerCase() != Trigger.InnerCase.ON_CONDITION_MET_TRIGGER) {"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -956,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (trigger.getInnerCase() != Trigger.InnerCase.ON_CONDITION_MET_TRIGGER) {"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -965,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            playAvdAnimations(Trigger.InnerCase.ON_VISIBLE_TRIGGER);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
@@ -974,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_ONCE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            playAvdAnimations(Trigger.InnerCase.ON_VISIBLE_ONCE_TRIGGER);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -983,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_LOAD_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        playAvdAnimations(Trigger.InnerCase.ON_LOAD_TRIGGER);"
         errorLine2="                                            ~~~~~~~~~~~~~~~">
@@ -992,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            playAvdAnimations(Trigger.InnerCase.ON_VISIBLE_TRIGGER);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
@@ -1001,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_ONCE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            playAvdAnimations(Trigger.InnerCase.ON_VISIBLE_ONCE_TRIGGER);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1010,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            stopAvdAnimations(Trigger.InnerCase.ON_VISIBLE_TRIGGER);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
@@ -1019,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_VISIBLE_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            resetAvdAnimations(Trigger.InnerCase.ON_VISIBLE_TRIGGER);"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~">
@@ -1028,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOnLoadTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Trigger.newBuilder().setOnLoadTrigger(OnLoadTrigger.getDefaultInstance()).build();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~">
@@ -1037,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnLoadTrigger.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Trigger.newBuilder().setOnLoadTrigger(OnLoadTrigger.getDefaultInstance()).build();"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~">
@@ -1046,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Trigger.newBuilder().setOnLoadTrigger(OnLoadTrigger.getDefaultInstance()).build();"
         errorLine2="                    ~~~~~~~~~~">
@@ -1055,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ContainerDimension.newBuilder()"
         errorLine2="                               ~~~~~~~~~~">
@@ -1064,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    .setWrappedDimension(WrappedDimensionProp.getDefaultInstance())"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
@@ -1073,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    .setWrappedDimension(WrappedDimensionProp.getDefaultInstance())"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~">
@@ -1082,79 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        mChildLayoutParams.apply(checkNotNull(child.getLayoutParams())));"
-        errorLine2="                                                 ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        mChildLayoutParams.apply(checkNotNull(child.getLayoutParams())));"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mLoadActionListener),"
-        errorLine2="                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mLoadActionListener),"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mProtoLayoutTheme),"
-        errorLine2="                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mProtoLayoutTheme),"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mClickableIdExtra),"
-        errorLine2="                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(mClickableIdExtra),"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return safeDpToPx(dpProp.getValue());"
         errorLine2="                                 ~~~~~~~~">
@@ -1163,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final int dividend = proportionalDimensionProp.getAspectRatioWidth();"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~">
@@ -1172,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final int divisor = proportionalDimensionProp.getAspectRatioHeight();"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~">
@@ -1181,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; width.getInnerCase() == InnerCase.EXPANDED_DIMENSION) {"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -1190,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; width.getInnerCase() == InnerCase.EXPANDED_DIMENSION) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~">
@@ -1199,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = width.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
@@ -1208,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.getLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = width.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                                            ~~~~~~~~~~~~~~~">
@@ -1217,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = width.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                                                              ~~~~~~~~">
@@ -1226,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; height.getInnerCase() == InnerCase.EXPANDED_DIMENSION) {"
         errorLine2="                          ~~~~~~~~~~~~">
@@ -1235,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; height.getInnerCase() == InnerCase.EXPANDED_DIMENSION) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
@@ -1244,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = height.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~">
@@ -1253,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.getLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = height.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                                             ~~~~~~~~~~~~~~~">
@@ -1262,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float weight = height.getExpandedDimension().getLayoutWeight().getValue();"
         errorLine2="                                                                               ~~~~~~~~">
@@ -1271,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (width.getWrappedDimension().hasMinimumSize()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
@@ -1280,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.hasMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (width.getWrappedDimension().hasMinimumSize()) {"
         errorLine2="                                        ~~~~~~~~~~~~~~">
@@ -1289,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            view.setMinimumWidth(safeDpToPx(width.getWrappedDimension().getMinimumSize()));"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~">
@@ -1298,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.getMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            view.setMinimumWidth(safeDpToPx(width.getWrappedDimension().getMinimumSize()));"
         errorLine2="                                                                        ~~~~~~~~~~~~~~">
@@ -1307,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (height.getWrappedDimension().hasMinimumSize()) {"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~">
@@ -1316,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.hasMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (height.getWrappedDimension().hasMinimumSize()) {"
         errorLine2="                                         ~~~~~~~~~~~~~~">
@@ -1325,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            view.setMinimumHeight(safeDpToPx(height.getWrappedDimension().getMinimumSize()));"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -1334,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.getMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            view.setMinimumHeight(safeDpToPx(height.getWrappedDimension().getMinimumSize()));"
         errorLine2="                                                                          ~~~~~~~~~~~~~~">
@@ -1343,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_START can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_START:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -1352,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1361,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_END can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_END:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -1370,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_LEFT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_LEFT:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1379,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_RIGHT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_RIGHT:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -1388,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1397,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.HORIZONTAL_ALIGN_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case HORIZONTAL_ALIGN_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1406,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_TOP can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_TOP:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1415,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1424,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_BOTTOM can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_BOTTOM:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1433,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1442,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1451,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (alignment.getValue()) {"
         errorLine2="                          ~~~~~~~~">
@@ -1460,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_TOP can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_TOP:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1469,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1478,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_BOTTOM can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_BOTTOM:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1487,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1496,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.VERTICAL_ALIGN_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VERTICAL_ALIGN_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1505,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.CONTENT_SCALE_MODE_FIT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case CONTENT_SCALE_MODE_FIT:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -1514,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.CONTENT_SCALE_MODE_CROP can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case CONTENT_SCALE_MODE_CROP:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1523,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.CONTENT_SCALE_MODE_FILL_BOUNDS can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case CONTENT_SCALE_MODE_FILL_BOUNDS:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1532,7 +1325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.CONTENT_SCALE_MODE_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case CONTENT_SCALE_MODE_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1541,7 +1334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1550,7 +1343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (alignment.getValue()) {"
         errorLine2="                          ~~~~~~~~">
@@ -1559,7 +1352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.SPAN_VERTICAL_ALIGN_TEXT_BASELINE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPAN_VERTICAL_ALIGN_TEXT_BASELINE:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1568,7 +1361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.SPAN_VERTICAL_ALIGN_BOTTOM can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPAN_VERTICAL_ALIGN_BOTTOM:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1577,7 +1370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.SPAN_VERTICAL_ALIGN_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPAN_VERTICAL_ALIGN_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1586,7 +1379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1595,7 +1388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (fontStyle.getWeight().getValue()) {"
         errorLine2="                          ~~~~~~~~~">
@@ -1604,7 +1397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (fontStyle.getWeight().getValue()) {"
         errorLine2="                                      ~~~~~~~~">
@@ -1613,7 +1406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_BOLD can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_BOLD:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -1622,7 +1415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_NORMAL can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_NORMAL:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1631,7 +1424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_MEDIUM can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_MEDIUM:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1640,7 +1433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1649,7 +1442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1658,7 +1451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        FontSet fonts = mProtoLayoutTheme.getFontSet(fontStyle.getVariant().getValue().getNumber());"
         errorLine2="                                                               ~~~~~~~~~~">
@@ -1667,7 +1460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        FontSet fonts = mProtoLayoutTheme.getFontSet(fontStyle.getVariant().getValue().getNumber());"
         errorLine2="                                                                                       ~~~~~~~~~">
@@ -1676,7 +1469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        FontSet fonts = mProtoLayoutTheme.getFontSet(fontStyle.getVariant().getValue().getNumber());"
         errorLine2="                                                                            ~~~~~~~~">
@@ -1685,7 +1478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (fontStyle.getWeight().getValue()) {"
         errorLine2="                          ~~~~~~~~~">
@@ -1694,7 +1487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (fontStyle.getWeight().getValue()) {"
         errorLine2="                                      ~~~~~~~~">
@@ -1703,7 +1496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_BOLD can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_BOLD:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -1712,7 +1505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_MEDIUM can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_MEDIUM:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1721,7 +1514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_NORMAL can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_NORMAL:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -1730,7 +1523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.FONT_WEIGHT_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case FONT_WEIGHT_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -1739,7 +1532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -1748,7 +1541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final boolean isItalic = fontStyle.getItalic().getValue();"
         errorLine2="                                                       ~~~~~~~~">
@@ -1757,7 +1550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final boolean isItalic = fontStyle.getItalic().getValue();"
         errorLine2="                                           ~~~~~~~~~">
@@ -1766,7 +1559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return !fontStyle.getItalic().getValue() &amp;&amp; !isBold(fontStyle);"
         errorLine2="                                      ~~~~~~~~">
@@ -1775,7 +1568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return !fontStyle.getItalic().getValue() &amp;&amp; !isBold(fontStyle);"
         errorLine2="                          ~~~~~~~~~">
@@ -1784,7 +1577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                spField.getValue(),"
         errorLine2="                        ~~~~~~~~">
@@ -1793,7 +1586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (style.hasSize()) {"
         errorLine2="                  ~~~~~~~">
@@ -1802,7 +1595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, style.getSize().getValue());"
         errorLine2="                                                                   ~~~~~~~">
@@ -1811,7 +1604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, style.getSize().getValue());"
         errorLine2="                                                                             ~~~~~~~~">
@@ -1820,7 +1613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (style.hasLetterSpacing()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
@@ -1829,7 +1622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setLetterSpacing(style.getLetterSpacing().getValue());"
         errorLine2="                                                               ~~~~~~~~">
@@ -1838,7 +1631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setLetterSpacing(style.getLetterSpacing().getValue());"
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
@@ -1847,7 +1640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (style.hasColor()) {"
         errorLine2="                  ~~~~~~~~">
@@ -1856,7 +1649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            handleProp(style.getColor(), textView::setTextColor, posId, pipelineMaker);"
         errorLine2="                             ~~~~~~~~">
@@ -1865,7 +1658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (style.hasSize()) {"
         errorLine2="                  ~~~~~~~">
@@ -1874,7 +1667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setTextSize(toPx(style.getSize()));"
         errorLine2="                                            ~~~~~~~">
@@ -1883,7 +1676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        view.setTag(R.id.clickable_id_tag, clickable.getId());"
         errorLine2="                                                     ~~~~~">
@@ -1892,7 +1685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getValueCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (clickable.getOnClick().getValueCase()) {"
         errorLine2="                                       ~~~~~~~~~~~~">
@@ -1901,7 +1694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (clickable.getOnClick().getValueCase()) {"
         errorLine2="                          ~~~~~~~~~~">
@@ -1910,7 +1703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.LAUNCH_ACTION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LAUNCH_ACTION:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -1919,7 +1712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                clickable.getOnClick().getLaunchAction(),"
         errorLine2="                                                       ~~~~~~~~~~~~~~~">
@@ -1928,7 +1721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                clickable.getOnClick().getLaunchAction(),"
         errorLine2="                                          ~~~~~~~~~~">
@@ -1937,7 +1730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                clickable.getId(),"
         errorLine2="                                          ~~~~~">
@@ -1946,7 +1739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.LOAD_ACTION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LOAD_ACTION:"
         errorLine2="                 ~~~~~~~~~~~">
@@ -1955,25 +1748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                checkNotNull(mLoadActionExecutor)"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                checkNotNull(mLoadActionExecutor)"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                                                                .getOnClick()"
         errorLine2="                                                                                 ~~~~~~~~~~">
@@ -1982,7 +1757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                                                                .getLoadAction(),"
         errorLine2="                                                                                 ~~~~~~~~~~~~~">
@@ -1991,7 +1766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                                                        clickable.getId()))));"
         errorLine2="                                                                                  ~~~~~">
@@ -2000,7 +1775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.VALUE_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case VALUE_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -2009,7 +1784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (padding.getRtlAware().getValue()) {"
         errorLine2="                                  ~~~~~~~~">
@@ -2018,7 +1793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (padding.getRtlAware().getValue()) {"
         errorLine2="                    ~~~~~~~~~~~">
@@ -2027,7 +1802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getStart()),"
         errorLine2="                                       ~~~~~~~~">
@@ -2036,7 +1811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getTop()),"
         errorLine2="                                       ~~~~~~">
@@ -2045,7 +1820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getEnd()),"
         errorLine2="                                       ~~~~~~">
@@ -2054,7 +1829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getBottom()));"
         errorLine2="                                       ~~~~~~~~~">
@@ -2063,7 +1838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getStart()),"
         errorLine2="                                       ~~~~~~~~">
@@ -2072,7 +1847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getTop()),"
         errorLine2="                                       ~~~~~~">
@@ -2081,7 +1856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getEnd()),"
         errorLine2="                                       ~~~~~~">
@@ -2090,7 +1865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    safeDpToPx(padding.getBottom()));"
         errorLine2="                                       ~~~~~~~~~">
@@ -2099,7 +1874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (background.hasColor()) {"
         errorLine2="                       ~~~~~~~~">
@@ -2108,7 +1883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            handleProp(background.getColor(), drawable::setColor, posId, pipelineMaker);"
         errorLine2="                                  ~~~~~~~~">
@@ -2117,7 +1892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (background.hasCorner()) {"
         errorLine2="                       ~~~~~~~~~">
@@ -2126,7 +1901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            final int radiusPx = safeDpToPx(background.getCorner().getRadius());"
         errorLine2="                                                       ~~~~~~~~~">
@@ -2135,7 +1910,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.getRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            final int radiusPx = safeDpToPx(background.getCorner().getRadius());"
         errorLine2="                                                                   ~~~~~~~~~">
@@ -2144,7 +1919,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int width = safeDpToPx(border.getWidth());"
         errorLine2="                                      ~~~~~~~~">
@@ -2153,7 +1928,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                border.getColor(),"
         errorLine2="                       ~~~~~~~~">
@@ -2162,7 +1937,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2171,7 +1946,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyClickable(view, modifiers.getClickable());"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -2180,7 +1955,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2189,7 +1964,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applySemantics(view, modifiers.getSemantics(), posId, pipelineMaker);"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -2198,7 +1973,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasPadding()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -2207,7 +1982,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyPadding(view, modifiers.getPadding());"
         errorLine2="                                         ~~~~~~~~~~">
@@ -2216,7 +1991,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasBackground()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2225,7 +2000,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            modifiers.getBackground(),"
         errorLine2="                                      ~~~~~~~~~~~~~">
@@ -2234,7 +2009,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasBorder()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2243,7 +2018,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    applyBorder(modifiers.getBorder(), backgroundDrawable, posId, pipelineMaker);"
         errorLine2="                                          ~~~~~~~~~">
@@ -2252,7 +2027,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasContentUpdateAnimation can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (mAnimationEnabled &amp;&amp; modifiers.hasContentUpdateAnimation()) {"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2261,7 +2036,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getContentUpdateAnimation can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    posId, modifiers.getContentUpdateAnimation()));"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2270,7 +2045,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.hasFadeIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (enterTransition.hasFadeIn()) {"
         errorLine2="                            ~~~~~~~~~">
@@ -2279,7 +2054,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.getFadeIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            FadeInTransition fadeIn = enterTransition.getFadeIn();"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2288,7 +2063,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.getInitialAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new AlphaAnimation(fadeIn.getInitialAlpha(), FADE_IN_TARGET_ALPHA);"
         errorLine2="                                              ~~~~~~~~~~~~~~~">
@@ -2297,7 +2072,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AnimationSpec spec = fadeIn.getAnimationSpec();"
         errorLine2="                                        ~~~~~~~~~~~~~~~~">
@@ -2306,7 +2081,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.hasSlideIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (enterTransition.hasSlideIn()) {"
         errorLine2="                            ~~~~~~~~~~">
@@ -2315,7 +2090,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.getSlideIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            SlideInTransition slideIn = enterTransition.getSlideIn();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -2324,7 +2099,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AnimationSpec spec = slideIn.getAnimationSpec();"
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
@@ -2333,7 +2108,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideIn.getDirectionValue()) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -2342,7 +2117,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_UNDEFINED_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case SlideDirection.SLIDE_DIRECTION_UNDEFINED_VALUE:"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2351,7 +2126,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE:"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2360,7 +2135,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_RIGHT_TO_LEFT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case SlideDirection.SLIDE_DIRECTION_RIGHT_TO_LEFT_VALUE:"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2369,7 +2144,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE:"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2378,7 +2153,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_BOTTOM_TO_TOP_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case SlideDirection.SLIDE_DIRECTION_BOTTOM_TO_TOP_VALUE:"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2387,7 +2162,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.hasFadeOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (exitTransition.hasFadeOut()) {"
         errorLine2="                           ~~~~~~~~~~">
@@ -2396,7 +2171,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.getFadeOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            FadeOutTransition fadeOut = exitTransition.getFadeOut();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -2405,7 +2180,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.getTargetAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new AlphaAnimation(FADE_OUT_INITIAL_ALPHA, fadeOut.getTargetAlpha());"
         errorLine2="                                                                       ~~~~~~~~~~~~~~">
@@ -2414,7 +2189,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AnimationSpec spec = fadeOut.getAnimationSpec();"
         errorLine2="                                         ~~~~~~~~~~~~~~~~">
@@ -2423,7 +2198,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.hasSlideOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (exitTransition.hasSlideOut()) {"
         errorLine2="                           ~~~~~~~~~~~">
@@ -2432,7 +2207,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.getSlideOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            SlideOutTransition slideOut = exitTransition.getSlideOut();"
         errorLine2="                                                         ~~~~~~~~~~~">
@@ -2441,7 +2216,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AnimationSpec spec = slideOut.getAnimationSpec();"
         errorLine2="                                          ~~~~~~~~~~~~~~~~">
@@ -2450,7 +2225,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                switch (slideOut.getDirectionValue()) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~">
@@ -2459,7 +2234,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_UNDEFINED_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case SlideDirection.SLIDE_DIRECTION_UNDEFINED_VALUE:"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2468,7 +2243,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE:"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2477,7 +2252,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_RIGHT_TO_LEFT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case SlideDirection.SLIDE_DIRECTION_RIGHT_TO_LEFT_VALUE:"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2486,7 +2261,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE:"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2495,7 +2270,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_BOTTOM_TO_TOP_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case SlideDirection.SLIDE_DIRECTION_BOTTOM_TO_TOP_VALUE:"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2504,7 +2279,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideIn.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2513,7 +2288,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideIn.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE"
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
@@ -2522,7 +2297,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.hasInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (slideIn.hasInitialSlideBound()) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
@@ -2531,7 +2306,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideIn.getInitialSlideBound().getInnerCase()) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -2540,7 +2315,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideIn.getInitialSlideBound().getInnerCase()) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
@@ -2549,7 +2324,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LINEAR_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2558,7 +2333,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getLinearBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -2567,7 +2342,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
@@ -2576,7 +2351,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideLinearBound.getOffsetDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                                           ~~~~~~~~~~~">
@@ -2585,7 +2360,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PARENT_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case PARENT_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2594,7 +2369,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
@@ -2603,7 +2378,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~">
@@ -2612,7 +2387,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.getSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -2621,7 +2396,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            == SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2630,7 +2405,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case INNER_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -2639,7 +2414,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideIn.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2648,7 +2423,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideIn.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE"
         errorLine2="                        ~~~~~~~~~~~~~~~~~">
@@ -2657,7 +2432,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.hasInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (slideIn.hasInitialSlideBound()) {"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~">
@@ -2666,7 +2441,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideIn.getInitialSlideBound().getInnerCase()) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -2675,7 +2450,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideIn.getInitialSlideBound().getInnerCase()) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
@@ -2684,7 +2459,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LINEAR_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2693,7 +2468,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getLinearBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -2702,7 +2477,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~">
@@ -2711,7 +2486,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideLinearBound.getOffsetDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideIn.getInitialSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                                           ~~~~~~~~~~~">
@@ -2720,7 +2495,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PARENT_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case PARENT_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2729,7 +2504,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
@@ -2738,7 +2513,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                ~~~~~~~~~~~~~~~~~~~~">
@@ -2747,7 +2522,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.getSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideIn.getInitialSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -2756,7 +2531,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            == SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2765,7 +2540,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case INNER_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -2774,7 +2549,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideOut.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2783,7 +2558,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideOut.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_LEFT_TO_RIGHT_VALUE"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -2792,7 +2567,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.hasTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (slideOut.hasTargetSlideBound()) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
@@ -2801,7 +2576,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideOut.getTargetSlideBound().getInnerCase()) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -2810,7 +2585,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideOut.getTargetSlideBound().getInnerCase()) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
@@ -2819,7 +2594,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LINEAR_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2828,7 +2603,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getLinearBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -2837,7 +2612,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideLinearBound.getOffsetDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                                           ~~~~~~~~~~~">
@@ -2846,7 +2621,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2855,7 +2630,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PARENT_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case PARENT_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2864,7 +2639,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
@@ -2873,7 +2648,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
@@ -2882,7 +2657,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.getSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -2891,7 +2666,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            == SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2900,7 +2675,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case INNER_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -2909,7 +2684,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideOut.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2918,7 +2693,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getDirectionValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                slideOut.getDirectionValue() == SlideDirection.SLIDE_DIRECTION_TOP_TO_BOTTOM_VALUE"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -2927,7 +2702,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.hasTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (slideOut.hasTargetSlideBound()) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
@@ -2936,7 +2711,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideOut.getTargetSlideBound().getInnerCase()) {"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -2945,7 +2720,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (slideOut.getTargetSlideBound().getInnerCase()) {"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~">
@@ -2954,7 +2729,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LINEAR_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2963,7 +2738,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getLinearBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -2972,7 +2747,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideLinearBound.getOffsetDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                                                           ~~~~~~~~~~~">
@@ -2981,7 +2756,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return slideOut.getTargetSlideBound().getLinearBound().getOffsetDp() * sign;"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2990,7 +2765,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PARENT_BOUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case PARENT_BOUND:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -2999,7 +2774,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
@@ -3008,7 +2783,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~">
@@ -3017,7 +2792,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.getSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (slideOut.getTargetSlideBound().getParentBound().getSnapTo()"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -3026,7 +2801,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            == SlideParentSnapOption.SLIDE_PARENT_SNAP_TO_OUTSIDE) {"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3035,7 +2810,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case INNER_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -3044,7 +2819,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3053,7 +2828,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyClickable(view, modifiers.getClickable());"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -3062,7 +2837,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3071,7 +2846,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applySemantics(view, modifiers.getSemantics(), posId, pipelineMaker);"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -3080,7 +2855,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.TEXT_ALIGN_START can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_ALIGN_START:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -3089,7 +2864,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.TEXT_ALIGN_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_ALIGN_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
@@ -3098,7 +2873,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.TEXT_ALIGN_END can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_ALIGN_END:"
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -3107,7 +2882,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.TEXT_ALIGN_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_ALIGN_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -3116,7 +2891,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -3125,7 +2900,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_TRUNCATE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_OVERFLOW_TRUNCATE:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3134,7 +2909,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_ELLIPSIZE_END can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_OVERFLOW_ELLIPSIZE_END:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3143,7 +2918,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_MARQUEE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_OVERFLOW_MARQUEE:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -3152,7 +2927,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT_OVERFLOW_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3161,7 +2936,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -3170,7 +2945,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.ARC_ANCHOR_START can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC_ANCHOR_START:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -3179,7 +2954,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.ARC_ANCHOR_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC_ANCHOR_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
@@ -3188,7 +2963,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.ARC_ANCHOR_END can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC_ANCHOR_END:"
         errorLine2="                 ~~~~~~~~~~~~~~">
@@ -3197,7 +2972,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.ARC_ANCHOR_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC_ANCHOR_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -3206,7 +2981,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -3215,7 +2990,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AngularAlignment.ANGULAR_ALIGNMENT_START can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ANGULAR_ALIGNMENT_START:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3224,7 +2999,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AngularAlignment.ANGULAR_ALIGNMENT_CENTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ANGULAR_ALIGNMENT_CENTER:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3233,7 +3008,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AngularAlignment.ANGULAR_ALIGNMENT_END can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ANGULAR_ALIGNMENT_END:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -3242,7 +3017,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AngularAlignment.ANGULAR_ALIGNMENT_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ANGULAR_ALIGNMENT_UNDEFINED:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3251,7 +3026,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AngularAlignment.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case UNRECOGNIZED:"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -3260,7 +3035,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (containerDimension.getInnerCase()) {"
         errorLine2="                                   ~~~~~~~~~~~~">
@@ -3269,7 +3044,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LINEAR_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -3278,7 +3053,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return safeDpToPx(containerDimension.getLinearDimension());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~">
@@ -3287,7 +3062,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case EXPANDED_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -3296,7 +3071,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.WRAPPED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case WRAPPED_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~">
@@ -3305,7 +3080,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -3314,7 +3089,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3323,7 +3098,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return fontStyle.getColor().getArgb();"
         errorLine2="                                        ~~~~~~~">
@@ -3332,7 +3107,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return fontStyle.getColor().getArgb();"
         errorLine2="                             ~~~~~~~~">
@@ -3341,7 +3116,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.hasAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (launchAction.hasAndroidActivity()) {"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
@@ -3350,7 +3125,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.getAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AndroidActivity activity = launchAction.getAndroidActivity();"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~">
@@ -3359,7 +3134,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getClassName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new Intent().setClassName(activity.getPackageName(), activity.getClassName());"
         errorLine2="                                                                                  ~~~~~~~~~~~~">
@@ -3368,7 +3143,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getPackageName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new Intent().setClassName(activity.getPackageName(), activity.getClassName());"
         errorLine2="                                                       ~~~~~~~~~~~~~~">
@@ -3377,7 +3152,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getKeyToExtraMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (Map.Entry&lt;String, AndroidExtra> entry : activity.getKeyToExtraMap().entrySet()) {"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~">
@@ -3386,7 +3161,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (entry.getValue().hasStringVal()) {"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -3395,7 +3170,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getStringVal().getValue());"
         errorLine2="                                                                ~~~~~~~~~~~~">
@@ -3404,7 +3179,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidStringExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getStringVal().getValue());"
         errorLine2="                                                                               ~~~~~~~~">
@@ -3413,7 +3188,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                } else if (entry.getValue().hasIntVal()) {"
         errorLine2="                                            ~~~~~~~~~">
@@ -3422,7 +3197,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getIntVal().getValue());"
         errorLine2="                                                                ~~~~~~~~~">
@@ -3431,7 +3206,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidIntExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getIntVal().getValue());"
         errorLine2="                                                                            ~~~~~~~~">
@@ -3440,7 +3215,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                } else if (entry.getValue().hasLongVal()) {"
         errorLine2="                                            ~~~~~~~~~~">
@@ -3449,7 +3224,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getLongVal().getValue());"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -3458,7 +3233,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidLongExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getLongVal().getValue());"
         errorLine2="                                                                             ~~~~~~~~">
@@ -3467,7 +3242,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                } else if (entry.getValue().hasDoubleVal()) {"
         errorLine2="                                            ~~~~~~~~~~~~">
@@ -3476,7 +3251,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidDoubleExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getDoubleVal().getValue());"
         errorLine2="                                                                               ~~~~~~~~">
@@ -3485,7 +3260,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getDoubleVal().getValue());"
         errorLine2="                                                                ~~~~~~~~~~~~">
@@ -3494,7 +3269,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                } else if (entry.getValue().hasBooleanVal()) {"
         errorLine2="                                            ~~~~~~~~~~~~~">
@@ -3503,7 +3278,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidBooleanExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getBooleanVal().getValue());"
         errorLine2="                                                                                ~~~~~~~~">
@@ -3512,7 +3287,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    i.putExtra(entry.getKey(), entry.getValue().getBooleanVal().getValue());"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -3521,7 +3296,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLastClickableId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return loadAction.getRequestState().toBuilder().setLastClickableId(clickableId).build();"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
@@ -3530,7 +3305,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.getRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return loadAction.getRequestState().toBuilder().setLastClickableId(clickableId).build();"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -3539,7 +3314,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                column.hasWidth() ? column.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                           ~~~~~~~~">
@@ -3548,7 +3323,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                column.hasWidth() ? column.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                       ~~~~~~~~">
@@ -3557,7 +3332,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                column.hasHeight() ? column.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                            ~~~~~~~~~">
@@ -3566,7 +3341,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                column.hasHeight() ? column.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                       ~~~~~~~~~">
@@ -3575,7 +3350,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!canMeasureContainer(width, height, column.getContentsList())) {"
         errorLine2="                                                       ~~~~~~~~~~~~~~~">
@@ -3584,7 +3359,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                horizontalAlignmentToGravity(column.getHorizontalAlignment().getValue()));"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3593,7 +3368,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                horizontalAlignmentToGravity(column.getHorizontalAlignment().getValue()));"
         errorLine2="                                                                             ~~~~~~~~">
@@ -3602,7 +3377,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiers(linearLayout, column.getModifiers(), columnPosId, pipelineMaker);"
         errorLine2="                                                    ~~~~~~~~~~~~">
@@ -3611,7 +3386,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    column.getContentsList(),"
         errorLine2="                           ~~~~~~~~~~~~~~~">
@@ -3620,7 +3395,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int numMissingChildren = includeChildren ? 0 : column.getContentsCount();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~">
@@ -3629,7 +3404,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension width = row.hasWidth() ? row.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                                        ~~~~~~~~">
@@ -3638,7 +3413,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension width = row.hasWidth() ? row.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                       ~~~~~~~~">
@@ -3647,7 +3422,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension height = row.hasHeight() ? row.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3656,7 +3431,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension height = row.hasHeight() ? row.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                        ~~~~~~~~~">
@@ -3665,7 +3440,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!canMeasureContainer(width, height, row.getContentsList())) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~">
@@ -3674,7 +3449,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        linearLayout.setGravity(verticalAlignmentToGravity(row.getVerticalAlignment().getValue()));"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~">
@@ -3683,7 +3458,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        linearLayout.setGravity(verticalAlignmentToGravity(row.getVerticalAlignment().getValue()));"
         errorLine2="                                                                                      ~~~~~~~~">
@@ -3692,7 +3467,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiers(linearLayout, row.getModifiers(), rowPosId, pipelineMaker);"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3701,7 +3476,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    row.getContentsList(),"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -3710,7 +3485,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int numMissingChildren = includeChildren ? 0 : row.getContentsCount();"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~">
@@ -3719,7 +3494,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension width = box.hasWidth() ? box.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                                        ~~~~~~~~">
@@ -3728,7 +3503,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension width = box.hasWidth() ? box.getWidth() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                       ~~~~~~~~">
@@ -3737,7 +3512,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension height = box.hasHeight() ? box.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                                          ~~~~~~~~~">
@@ -3746,7 +3521,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        ContainerDimension height = box.hasHeight() ? box.getHeight() : CONTAINER_DIMENSION_DEFAULT;"
         errorLine2="                                        ~~~~~~~~~">
@@ -3755,7 +3530,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!canMeasureContainer(width, height, box.getContentsList())) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~">
@@ -3764,7 +3539,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        box.getHorizontalAlignment().getValue(),"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3773,7 +3548,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        box.getHorizontalAlignment().getValue(),"
         errorLine2="                                                     ~~~~~~~~">
@@ -3782,7 +3557,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        box.getVerticalAlignment().getValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~">
@@ -3791,7 +3566,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        box.getVerticalAlignment().getValue());"
         errorLine2="                                                   ~~~~~~~~">
@@ -3800,7 +3575,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        View wrappedView = applyModifiers(frame, box.getModifiers(), boxPosId, pipelineMaker);"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -3809,7 +3584,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    box.getContentsList(),"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -3818,7 +3593,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int numMissingChildren = includeChildren ? 0 : box.getContentsCount();"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~">
@@ -3827,7 +3602,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (needsSizeWrapper(spacer.getWidth()) || needsSizeWrapper(spacer.getHeight())) {"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -3836,7 +3611,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (needsSizeWrapper(spacer.getWidth()) || needsSizeWrapper(spacer.getHeight())) {"
         errorLine2="                                    ~~~~~~~~">
@@ -3845,7 +3620,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getWidth().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                                                       ~~~~~~~~~~~~~~~">
@@ -3854,7 +3629,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getWidth().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                       ~~~~~~~~">
@@ -3863,7 +3638,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getWidth().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
@@ -3872,7 +3647,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float widthForLayout = spacer.getWidth().getLinearDimension().getValueForLayout();"
         errorLine2="                                                                              ~~~~~~~~~~~~~~~~~">
@@ -3881,7 +3656,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float widthForLayout = spacer.getWidth().getLinearDimension().getValueForLayout();"
         errorLine2="                                              ~~~~~~~~">
@@ -3890,7 +3665,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float widthForLayout = spacer.getWidth().getLinearDimension().getValueForLayout();"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~">
@@ -3899,7 +3674,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getHeight().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~">
@@ -3908,7 +3683,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getHeight().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                       ~~~~~~~~~">
@@ -3917,7 +3692,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (spacer.getHeight().getLinearDimension().hasDynamicValue()) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~">
@@ -3926,7 +3701,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float heightForLayout = spacer.getHeight().getLinearDimension().getValueForLayout();"
         errorLine2="                                                                                ~~~~~~~~~~~~~~~~~">
@@ -3935,7 +3710,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float heightForLayout = spacer.getHeight().getLinearDimension().getValueForLayout();"
         errorLine2="                                               ~~~~~~~~~">
@@ -3944,7 +3719,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                float heightForLayout = spacer.getHeight().getLinearDimension().getValueForLayout();"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~">
@@ -3953,7 +3728,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    spacer.getWidth()"
         errorLine2="                                           ~~~~~~~~">
@@ -3962,7 +3737,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                            .getLinearDimension()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -3971,7 +3746,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getHorizontalAlignmentForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                            .getHorizontalAlignmentForLayout())"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3980,7 +3755,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    spacer.getHeight()"
         errorLine2="                                           ~~~~~~~~~">
@@ -3989,7 +3764,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                            .getLinearDimension()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -3998,7 +3773,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getVerticalAlignmentForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                            .getVerticalAlignmentForLayout());"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4007,7 +3782,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (spacer.hasModifiers()) {"
         errorLine2="                   ~~~~~~~~~~~~">
@@ -4016,7 +3791,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            new View(mUiContext), spacer.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -4025,7 +3800,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getWidth().getLinearDimension(),"
         errorLine2="                           ~~~~~~~~">
@@ -4034,7 +3809,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getWidth().getLinearDimension(),"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
@@ -4043,7 +3818,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getHeight().getLinearDimension(),"
         errorLine2="                           ~~~~~~~~~">
@@ -4052,7 +3827,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getHeight().getLinearDimension(),"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
@@ -4061,7 +3836,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getWidth().getLinearDimension(),"
         errorLine2="                           ~~~~~~~~">
@@ -4070,7 +3845,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getWidth().getLinearDimension(),"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~">
@@ -4079,7 +3854,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getHeight().getLinearDimension(),"
         errorLine2="                           ~~~~~~~~~">
@@ -4088,7 +3863,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    spacer.getHeight().getLinearDimension(),"
         errorLine2="                                       ~~~~~~~~~~~~~~~~~~">
@@ -4097,7 +3872,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int thicknessPx = safeDpToPx(spacer.getThickness());"
         errorLine2="                                            ~~~~~~~~~~~~">
@@ -4106,7 +3881,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (spacer.hasAngularLength()) {"
         errorLine2="                   ~~~~~~~~~~~~~~~~">
@@ -4115,7 +3890,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            final ArcSpacerLength angularLength = spacer.getAngularLength();"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~">
@@ -4124,7 +3899,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacerLength.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (angularLength.getInnerCase()) {"
         errorLine2="                                  ~~~~~~~~~~~~">
@@ -4133,7 +3908,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.DEGREES can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case DEGREES:"
         errorLine2="                     ~~~~~~~">
@@ -4142,7 +3917,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacerLength.getDegrees can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    lengthDegrees = max(0, angularLength.getDegrees().getValue());"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -4151,7 +3926,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    lengthDegrees = max(0, angularLength.getDegrees().getValue());"
         errorLine2="                                                                      ~~~~~~~~">
@@ -4160,7 +3935,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_ANGULAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case EXPANDED_ANGULAR_DIMENSION:"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4169,7 +3944,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacerLength.getExpandedAngularDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        .getExpandedAngularDimension()"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4178,7 +3953,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedAngularDimensionProp.getLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        .getLayoutWeight()"
         errorLine2="                                         ~~~~~~~~~~~~~~~">
@@ -4187,7 +3962,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        .getValue();"
         errorLine2="                                         ~~~~~~~~">
@@ -4196,7 +3971,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        space, spacer.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -4205,7 +3980,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case INNER_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -4214,7 +3989,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            lengthDegrees = max(0, spacer.getLength().getValue());"
         errorLine2="                                          ~~~~~~~~~">
@@ -4223,7 +3998,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            lengthDegrees = max(0, spacer.getLength().getValue());"
         errorLine2="                                                      ~~~~~~~~">
@@ -4232,7 +4007,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiersToArcLayoutView(space, spacer.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                            ~~~~~~~~~~~~">
@@ -4241,7 +4016,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        TextOverflow overflowValue = overflow.getValue();"
         errorLine2="                                              ~~~~~~~~">
@@ -4250,7 +4025,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_MARQUEE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (!mAnimationEnabled &amp;&amp; overflowValue == TextOverflow.TEXT_OVERFLOW_MARQUEE) {"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~~~">
@@ -4259,7 +4034,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            overflowValue = TextOverflow.TEXT_OVERFLOW_UNDEFINED;"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4268,7 +4043,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.TEXT_OVERFLOW_MARQUEE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (overflowValue == TextOverflow.TEXT_OVERFLOW_MARQUEE &amp;&amp; textView.getMaxLines() == 1) {"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~">
@@ -4277,7 +4052,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.hasIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    marqueeParameters.hasIterations()"
         errorLine2="                                      ~~~~~~~~~~~~~">
@@ -4286,7 +4061,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.getIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            ? marqueeParameters.getIterations()"
         errorLine2="                                                ~~~~~~~~~~~~~">
@@ -4295,7 +4070,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        boolean needsSizeWrapper = needsSizeWrapper(text.getText());"
         errorLine2="                                                         ~~~~~~~">
@@ -4304,7 +4079,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                text.getText(),"
         errorLine2="                     ~~~~~~~">
@@ -4313,7 +4088,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (text.getFontStyle().getUnderline().getValue()) {"
         errorLine2="                                                           ~~~~~~~~">
@@ -4322,7 +4097,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (text.getFontStyle().getUnderline().getValue()) {"
         errorLine2="                                            ~~~~~~~~~~~~">
@@ -4331,7 +4106,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (text.getFontStyle().getUnderline().getValue()) {"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -4340,7 +4115,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        textView.setGravity(textAlignToAndroidGravity(text.getMultilineAlignment().getValue()));"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~">
@@ -4349,7 +4124,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        textView.setGravity(textAlignToAndroidGravity(text.getMultilineAlignment().getValue()));"
         errorLine2="                                                                                   ~~~~~~~~">
@@ -4358,7 +4133,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (text.hasMaxLines() &amp;&amp; !needsSizeWrapper) {"
         errorLine2="                 ~~~~~~~~~~~">
@@ -4367,7 +4142,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setMaxLines(max(TEXT_MIN_LINES, text.getMaxLines().getValue()));"
         errorLine2="                                                                        ~~~~~~~~">
@@ -4376,7 +4151,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            textView.setMaxLines(max(TEXT_MIN_LINES, text.getMaxLines().getValue()));"
         errorLine2="                                                          ~~~~~~~~~~~">
@@ -4385,7 +4160,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyTextOverflow(textView, text.getOverflow(), text.getMarqueeParameters());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4394,7 +4169,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyTextOverflow(textView, text.getOverflow(), text.getMarqueeParameters());"
         errorLine2="                                         ~~~~~~~~~~~">
@@ -4403,7 +4178,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (text.hasFontStyle()) {"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -4412,7 +4187,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyFontStyle(text.getFontStyle(), textView, posId, pipelineMaker);"
         errorLine2="                                ~~~~~~~~~~~~">
@@ -4421,7 +4196,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyFontStyle(FontStyle.getDefaultInstance(), textView, posId, pipelineMaker);"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~">
@@ -4430,7 +4205,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (text.hasAndroidTextStyle()) {"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~">
@@ -4439,7 +4214,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidTextStyle.getExcludeFontPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            excludeFontPadding = text.getAndroidTextStyle().getExcludeFontPadding();"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~">
@@ -4448,7 +4223,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            excludeFontPadding = text.getAndroidTextStyle().getExcludeFontPadding();"
         errorLine2="                                      ~~~~~~~~~~~~~~~~~~~">
@@ -4457,7 +4232,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (text.hasLineHeight()) {"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -4466,7 +4241,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            float lineHeightPx = toPx(text.getLineHeight());"
         errorLine2="                                           ~~~~~~~~~~~~~">
@@ -4475,7 +4250,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        View wrappedView = applyModifiers(textView, text.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -4484,7 +4259,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            String valueForLayout = text.getText().getValueForLayout();"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~">
@@ -4493,7 +4268,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            String valueForLayout = text.getText().getValueForLayout();"
         errorLine2="                                         ~~~~~~~">
@@ -4502,7 +4277,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getTextAlignmentForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            int gravity = textAlignToAndroidGravity(text.getText().getTextAlignmentForLayout());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4511,7 +4286,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            int gravity = textAlignToAndroidGravity(text.getText().getTextAlignmentForLayout());"
         errorLine2="                                                         ~~~~~~~">
@@ -4520,7 +4295,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        textView.setText(text.getText().getValue());"
         errorLine2="                              ~~~~~~~">
@@ -4529,7 +4304,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        textView.setText(text.getText().getValue());"
         errorLine2="                                        ~~~~~~~~">
@@ -4538,7 +4313,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (text.hasFontStyle()) {"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -4547,7 +4322,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            applyFontStyle(text.getFontStyle(), textView);"
         errorLine2="                                ~~~~~~~~~~~~">
@@ -4556,7 +4331,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        textView.setTextColor(extractTextColorArgb(text.getFontStyle()));"
         errorLine2="                                                        ~~~~~~~~~~~~">
@@ -4565,7 +4340,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiersToArcLayoutView(textView, text.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                             ~~~~~~~~~~~~">
@@ -4574,7 +4349,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return dimension.getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -4583,7 +4358,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        return dimension.getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~">
@@ -4592,7 +4367,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; dimension.getLinearDimension().getValue() == 0;"
         errorLine2="                                                  ~~~~~~~~">
@@ -4601,7 +4376,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; dimension.getLinearDimension().getValue() == 0;"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -4610,7 +4385,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (dimension.getInnerCase()) {"
         errorLine2="                          ~~~~~~~~~~~~">
@@ -4619,7 +4394,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LINEAR_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -4628,7 +4403,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ContainerDimension.newBuilder()"
         errorLine2="                                          ~~~~~~~~~~">
@@ -4637,7 +4412,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setLinearDimension(dimension.getLinearDimension())"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
@@ -4646,7 +4421,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setLinearDimension(dimension.getLinearDimension())"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
@@ -4655,7 +4430,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case EXPANDED_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -4664,7 +4439,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ContainerDimension.newBuilder()"
         errorLine2="                                          ~~~~~~~~~~">
@@ -4673,7 +4448,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setExpandedDimension(ExpandedDimensionProp.getDefaultInstance())"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -4682,7 +4457,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setExpandedDimension(ExpandedDimensionProp.getDefaultInstance())"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~">
@@ -4691,7 +4466,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case PROPORTIONAL_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4700,7 +4475,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ContainerDimension.newBuilder()"
         errorLine2="                                          ~~~~~~~~~~">
@@ -4709,7 +4484,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setWrappedDimension(WrappedDimensionProp.getDefaultInstance())"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
@@ -4718,7 +4493,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .setWrappedDimension(WrappedDimensionProp.getDefaultInstance())"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -4727,7 +4502,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -4736,7 +4511,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &quot;ImageDimension has an unknown dimension type: &quot; + dimension.getInnerCase().name());"
         errorLine2="                                                                             ~~~~~~~~~~~~">
@@ -4745,7 +4520,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        String protoResId = image.getResourceId().getValue();"
         errorLine2="                                  ~~~~~~~~~~~~~">
@@ -4754,7 +4529,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        String protoResId = image.getResourceId().getValue();"
         errorLine2="                                                  ~~~~~~~~">
@@ -4763,7 +4538,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET"
         errorLine2="                  ~~~~~~~~">
@@ -4772,7 +4547,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -4781,7 +4556,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET"
         errorLine2="                                                                        ~~~~~~~~~~~~~">
@@ -4790,7 +4565,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || image.getHeight().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET) {"
         errorLine2="                         ~~~~~~~~~">
@@ -4799,7 +4574,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || image.getHeight().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET) {"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -4808,7 +4583,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || image.getHeight().getInnerCase() == ImageDimension.InnerCase.INNER_NOT_SET) {"
         errorLine2="                                                                                ~~~~~~~~~~~~~">
@@ -4817,7 +4592,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (isZeroLengthImageDimension(image.getWidth())"
         errorLine2="                                             ~~~~~~~~">
@@ -4826,7 +4601,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || isZeroLengthImageDimension(image.getHeight())) {"
         errorLine2="                                                    ~~~~~~~~~">
@@ -4835,7 +4610,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION"
         errorLine2="                  ~~~~~~~~">
@@ -4844,7 +4619,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -4853,7 +4628,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4862,7 +4637,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; image.getHeight().getInnerCase()"
         errorLine2="                         ~~~~~~~~~">
@@ -4871,7 +4646,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                &amp;&amp; image.getHeight().getInnerCase()"
         errorLine2="                                     ~~~~~~~~~~~~">
@@ -4880,7 +4655,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4889,7 +4664,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                  ~~~~~~~~">
@@ -4898,7 +4673,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -4907,7 +4682,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4916,7 +4691,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ratio = safeAspectRatioOrNull(image.getWidth().getProportionalDimension());"
         errorLine2="                                                ~~~~~~~~">
@@ -4925,7 +4700,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ratio = safeAspectRatioOrNull(image.getWidth().getProportionalDimension());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4934,7 +4709,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                  ~~~~~~~~~">
@@ -4943,7 +4718,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                              ~~~~~~~~~~~~">
@@ -4952,7 +4727,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.PROPORTIONAL_DIMENSION) {"
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4961,7 +4736,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ratio = safeAspectRatioOrNull(image.getHeight().getProportionalDimension());"
         errorLine2="                                                ~~~~~~~~~">
@@ -4970,7 +4745,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ratio = safeAspectRatioOrNull(image.getHeight().getProportionalDimension());"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4979,7 +4754,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.hasContentScaleMode()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
@@ -4988,7 +4763,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    contentScaleModeToScaleType(image.getContentScaleMode().getValue()));"
         errorLine2="                                                                            ~~~~~~~~">
@@ -4997,7 +4772,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    contentScaleModeToScaleType(image.getContentScaleMode().getValue()));"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~">
@@ -5006,7 +4781,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                  ~~~~~~~~">
@@ -5015,7 +4790,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -5024,7 +4799,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getWidth().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~">
@@ -5033,7 +4808,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            imageView.setMinimumWidth(safeDpToPx(image.getWidth().getLinearDimension()));"
         errorLine2="                                                       ~~~~~~~~">
@@ -5042,7 +4817,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            imageView.setMinimumWidth(safeDpToPx(image.getWidth().getLinearDimension()));"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -5051,7 +4826,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                  ~~~~~~~~~">
@@ -5060,7 +4835,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                              ~~~~~~~~~~~~">
@@ -5069,7 +4844,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getHeight().getInnerCase() == ImageDimension.InnerCase.LINEAR_DIMENSION) {"
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~">
@@ -5078,7 +4853,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            imageView.setMinimumHeight(safeDpToPx(image.getHeight().getLinearDimension()));"
         errorLine2="                                                        ~~~~~~~~~">
@@ -5087,7 +4862,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            imageView.setMinimumHeight(safeDpToPx(image.getHeight().getLinearDimension()));"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~">
@@ -5096,7 +4871,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        imageDimensionToContainerDimension(image.getWidth()),"
         errorLine2="                                                                 ~~~~~~~~">
@@ -5105,7 +4880,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        imageDimensionToContainerDimension(image.getHeight()));"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -5114,7 +4889,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiers(imageView, image.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                ~~~~~~~~~~~~">
@@ -5123,7 +4898,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            &amp;&amp; trigger.getInnerCase()"
         errorLine2="                                       ~~~~~~~~~~~~">
@@ -5132,7 +4907,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ON_CONDITION_MET_TRIGGER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    == Trigger.InnerCase.ON_CONDITION_MET_TRIGGER) {"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5141,7 +4916,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getOnConditionMetTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        OnConditionMetTrigger conditionTrigger = trigger.getOnConditionMetTrigger();"
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5150,7 +4925,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnConditionMetTrigger.getCondition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        avd, trigger, posId, conditionTrigger.getCondition());"
         errorLine2="                                                                              ~~~~~~~~~~~~">
@@ -5159,7 +4934,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                || trigger.getInnerCase() == Trigger.InnerCase.INNER_NOT_SET) {"
         errorLine2="                                                                               ~~~~~~~~~~~~~">
@@ -5168,7 +4943,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                || trigger.getInnerCase() == Trigger.InnerCase.INNER_NOT_SET) {"
         errorLine2="                                           ~~~~~~~~~~~~">
@@ -5177,7 +4952,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.hasTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getColorFilter().hasTint() &amp;&amp; canImageBeTinted) {"
         errorLine2="                                   ~~~~~~~">
@@ -5186,7 +4961,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (image.getColorFilter().hasTint() &amp;&amp; canImageBeTinted) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
@@ -5195,7 +4970,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.getTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    image.getColorFilter().getTint(),"
         errorLine2="                                           ~~~~~~~">
@@ -5204,7 +4979,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    image.getColorFilter().getTint(),"
         errorLine2="                          ~~~~~~~~~~~~~~">
@@ -5213,7 +4988,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (line.hasAngularLength()) {"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -5222,7 +4997,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (line.getAngularLength().getInnerCase() == ArcLineLength.InnerCase.DEGREES) {"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
@@ -5231,7 +5006,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLineLength.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (line.getAngularLength().getInnerCase() == ArcLineLength.InnerCase.DEGREES) {"
         errorLine2="                                        ~~~~~~~~~~~~">
@@ -5240,7 +5015,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.DEGREES can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (line.getAngularLength().getInnerCase() == ArcLineLength.InnerCase.DEGREES) {"
         errorLine2="                                                                                  ~~~~~~~">
@@ -5249,7 +5024,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                lengthDegrees = max(0, line.getAngularLength().getDegrees().getValue());"
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
@@ -5258,7 +5033,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLineLength.getDegrees can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                lengthDegrees = max(0, line.getAngularLength().getDegrees().getValue());"
         errorLine2="                                                               ~~~~~~~~~~">
@@ -5267,7 +5042,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                lengthDegrees = max(0, line.getAngularLength().getDegrees().getValue());"
         errorLine2="                                                                            ~~~~~~~~">
@@ -5276,7 +5051,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            lengthDegrees = max(0, line.getLength().getValue());"
         errorLine2="                                        ~~~~~~~~~">
@@ -5285,7 +5060,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            lengthDegrees = max(0, line.getLength().getValue());"
         errorLine2="                                                    ~~~~~~~~">
@@ -5294,7 +5069,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int thicknessPx = safeDpToPx(line.getThickness());"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -5303,7 +5078,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (line.hasColor()) {"
         errorLine2="                 ~~~~~~~~">
@@ -5312,7 +5087,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            handleProp(line.getColor(), lineView::setColor, posId, pipelineMaker);"
         errorLine2="                            ~~~~~~~~">
@@ -5321,7 +5096,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasStrokeCap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (line.hasStrokeCap()) {"
         errorLine2="                 ~~~~~~~~~~~~">
@@ -5330,7 +5105,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getStrokeCap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (line.getStrokeCap().getValue()) {"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -5339,7 +5114,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCapProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (line.getStrokeCap().getValue()) {"
         errorLine2="                                        ~~~~~~~~">
@@ -5348,7 +5123,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.STROKE_CAP_BUTT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case STROKE_CAP_BUTT:"
         errorLine2="                     ~~~~~~~~~~~~~~~">
@@ -5357,7 +5132,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.STROKE_CAP_ROUND can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case STROKE_CAP_ROUND:"
         errorLine2="                     ~~~~~~~~~~~~~~~~">
@@ -5366,7 +5141,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.STROKE_CAP_SQUARE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case STROKE_CAP_SQUARE:"
         errorLine2="                     ~~~~~~~~~~~~~~~~~">
@@ -5375,7 +5150,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.UNRECOGNIZED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case UNRECOGNIZED:"
         errorLine2="                     ~~~~~~~~~~~~">
@@ -5384,7 +5159,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.STROKE_CAP_UNDEFINED can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case STROKE_CAP_UNDEFINED:"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -5393,7 +5168,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (line.hasAngularLength()) {"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -5402,7 +5177,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            final ArcLineLength angularLength = line.getAngularLength();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -5411,7 +5186,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLineLength.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (angularLength.getInnerCase()) {"
         errorLine2="                                  ~~~~~~~~~~~~">
@@ -5420,7 +5195,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.DEGREES can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case DEGREES:"
         errorLine2="                     ~~~~~~~">
@@ -5429,7 +5204,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getAngularLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    length = line.getAngularLength().getDegrees();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~">
@@ -5438,7 +5213,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLineLength.getDegrees can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    length = line.getAngularLength().getDegrees();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -5447,7 +5222,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_ANGULAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case EXPANDED_ANGULAR_DIMENSION:"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5456,7 +5231,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLineLength.getExpandedAngularDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                angularLength.getExpandedAngularDimension();"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5465,7 +5240,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedAngularDimensionProp.hasLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                expandedAngularDimension.hasLayoutWeight()"
         errorLine2="                                                         ~~~~~~~~~~~~~~~">
@@ -5474,7 +5249,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedAngularDimensionProp.getLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        ? expandedAngularDimension.getLayoutWeight().getValue()"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -5483,7 +5258,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        ? expandedAngularDimension.getLayoutWeight().getValue()"
         errorLine2="                                                                                     ~~~~~~~~">
@@ -5492,7 +5267,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        length = DegreesProp.getDefaultInstance();"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -5501,7 +5276,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    length = DegreesProp.getDefaultInstance();"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~">
@@ -5510,7 +5285,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            length = line.getLength();"
         errorLine2="                          ~~~~~~~~~">
@@ -5519,7 +5294,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                getSizeForLayout(line.getLength(), WearCurvedLineView.SWEEP_ANGLE_WRAP_LENGTH);"
         errorLine2="                                      ~~~~~~~~~">
@@ -5528,7 +5303,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getAngularAlignmentForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    angularAlignmentProtoToAngularAlignment(length.getAngularAlignmentForLayout()));"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5537,7 +5312,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                applyModifiersToArcLayoutView(lineView, line.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                             ~~~~~~~~~~~~">
@@ -5546,7 +5321,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                arc.getAnchorAngle(),"
         errorLine2="                    ~~~~~~~~~~~~~~">
@@ -5555,7 +5330,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        arcLayout.setAnchorAngleDegrees(arc.getAnchorAngle().getValue());"
         errorLine2="                                            ~~~~~~~~~~~~~~">
@@ -5564,7 +5339,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        arcLayout.setAnchorAngleDegrees(arc.getAnchorAngle().getValue());"
         errorLine2="                                                             ~~~~~~~~">
@@ -5573,7 +5348,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        arcLayout.setAnchorType(anchorTypeToAnchorPos(arc.getAnchorType().getValue()));"
         errorLine2="                                                          ~~~~~~~~~~~~~">
@@ -5582,7 +5357,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        arcLayout.setAnchorType(anchorTypeToAnchorPos(arc.getAnchorType().getValue()));"
         errorLine2="                                                                          ~~~~~~~~">
@@ -5591,7 +5366,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasMaxAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (arc.hasMaxAngle()) {"
         errorLine2="                ~~~~~~~~~~~">
@@ -5600,7 +5375,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getMaxAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            arcLayout.setMaxAngleDegrees(arc.getMaxAngle().getValue());"
         errorLine2="                                             ~~~~~~~~~~~">
@@ -5609,7 +5384,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            arcLayout.setMaxAngleDegrees(arc.getMaxAngle().getValue());"
         errorLine2="                                                           ~~~~~~~~">
@@ -5618,7 +5393,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (ArcLayoutElement child : arc.getContentsList()) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~">
@@ -5627,7 +5402,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (child.hasAdapter()) {"
         errorLine2="                              ~~~~~~~~~~">
@@ -5636,7 +5411,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        rotate = child.getAdapter().getRotateContents().getValue();"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~">
@@ -5645,7 +5420,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        rotate = child.getAdapter().getRotateContents().getValue();"
         errorLine2="                                       ~~~~~~~~~~">
@@ -5654,7 +5429,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        rotate = child.getAdapter().getRotateContents().getValue();"
         errorLine2="                                                                        ~~~~~~~~">
@@ -5663,7 +5438,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            verticalAlignmentToArcVAlign(arc.getVerticalAlign()));"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~">
@@ -5672,7 +5447,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        View wrappedView = applyModifiers(arcLayout, arc.getModifiers(), arcPosId, pipelineMaker);"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -5681,7 +5456,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int numMissingChildren = includeChildren ? 0 : arc.getContentsCount();"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~">
@@ -5690,7 +5465,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.hasSize()) {"
         errorLine2="                      ~~~~~~~">
@@ -5699,7 +5474,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            AbsoluteSizeSpan span = new AbsoluteSizeSpan(round(toPx(fontStyle.getSize())));"
         errorLine2="                                                                              ~~~~~~~">
@@ -5708,7 +5483,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.hasWeight() || fontStyle.hasVariant()) {"
         errorLine2="                                               ~~~~~~~~~~">
@@ -5717,7 +5492,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.hasWeight() || fontStyle.hasVariant()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5726,7 +5501,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.getUnderline().getValue()) {"
         errorLine2="                                     ~~~~~~~~">
@@ -5735,7 +5510,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.getUnderline().getValue()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5744,7 +5519,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (fontStyle.hasLetterSpacing()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -5753,7 +5528,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            LetterSpacingSpan span = new LetterSpacingSpan(fontStyle.getLetterSpacing().getValue());"
         errorLine2="                                                                                        ~~~~~~~~">
@@ -5762,7 +5537,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            LetterSpacingSpan span = new LetterSpacingSpan(fontStyle.getLetterSpacing().getValue());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~">
@@ -5771,7 +5546,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (modifiers.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5780,7 +5555,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            ClickableSpan clickableSpan = new ProtoLayoutClickableSpan(modifiers.getClickable());"
         errorLine2="                                                                                 ~~~~~~~~~~~~">
@@ -5789,7 +5564,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int lastPos = currentPos + text.getText().getValue().length();"
         errorLine2="                                        ~~~~~~~">
@@ -5798,7 +5573,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int lastPos = currentPos + text.getText().getValue().length();"
         errorLine2="                                                  ~~~~~~~~">
@@ -5807,7 +5582,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        builder.append(text.getText().getValue());"
         errorLine2="                            ~~~~~~~">
@@ -5816,7 +5591,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        builder.append(text.getText().getValue());"
         errorLine2="                                      ~~~~~~~~">
@@ -5825,7 +5600,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyStylesToSpan(builder, currentPos, lastPos, text.getFontStyle());"
         errorLine2="                                                             ~~~~~~~~~~~~">
@@ -5834,7 +5609,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyModifiersToSpan(builder, currentPos, lastPos, text.getModifiers());"
         errorLine2="                                                                ~~~~~~~~~~~~">
@@ -5843,7 +5618,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        String protoResId = protoImage.getResourceId().getValue();"
         errorLine2="                                       ~~~~~~~~~~~~~">
@@ -5852,7 +5627,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        String protoResId = protoImage.getResourceId().getValue();"
         errorLine2="                                                       ~~~~~~~~">
@@ -5861,7 +5636,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (protoImage.getWidth().getValue() == 0 || protoImage.getHeight().getValue() == 0) {"
         errorLine2="                                  ~~~~~~~~">
@@ -5870,7 +5645,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (protoImage.getWidth().getValue() == 0 || protoImage.getHeight().getValue() == 0) {"
         errorLine2="                                                                            ~~~~~~~~">
@@ -5879,7 +5654,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (protoImage.getWidth().getValue() == 0 || protoImage.getHeight().getValue() == 0) {"
         errorLine2="                                                                ~~~~~~~~~">
@@ -5888,7 +5663,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (protoImage.getWidth().getValue() == 0 || protoImage.getHeight().getValue() == 0) {"
         errorLine2="                       ~~~~~~~~">
@@ -5897,7 +5672,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                + protoImage.getResourceId().getValue());"
         errorLine2="                                             ~~~~~~~~~~~~~">
@@ -5906,7 +5681,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                + protoImage.getResourceId().getValue());"
         errorLine2="                                                             ~~~~~~~~">
@@ -5915,7 +5690,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                0, 0, safeDpToPx(protoImage.getWidth()), safeDpToPx(protoImage.getHeight()));"
         errorLine2="                                                                               ~~~~~~~~~">
@@ -5924,7 +5699,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                0, 0, safeDpToPx(protoImage.getWidth()), safeDpToPx(protoImage.getHeight()));"
         errorLine2="                                            ~~~~~~~~">
@@ -5933,7 +5708,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        spanVerticalAlignmentToImgSpanAlignment(protoImage.getAlignment()));"
         errorLine2="                                                                           ~~~~~~~~~~~~">
@@ -5942,7 +5717,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyModifiersToSpan(builder, startPos, endPos, protoImage.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -5951,7 +5726,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final String protoResourceId = protoImage.getResourceId().getValue();"
         errorLine2="                                                  ~~~~~~~~~~~~~">
@@ -5960,7 +5735,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        final String protoResourceId = protoImage.getResourceId().getValue();"
         errorLine2="                                                                  ~~~~~~~~">
@@ -5969,7 +5744,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    0, 0, safeDpToPx(protoImage.getWidth()), safeDpToPx(protoImage.getHeight()));"
         errorLine2="                                                                                   ~~~~~~~~~">
@@ -5978,7 +5753,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    0, 0, safeDpToPx(protoImage.getWidth()), safeDpToPx(protoImage.getHeight()));"
         errorLine2="                                                ~~~~~~~~">
@@ -5987,7 +5762,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            spanVerticalAlignmentToImgSpanAlignment(protoImage.getAlignment()));"
         errorLine2="                                                                               ~~~~~~~~~~~~">
@@ -5996,7 +5771,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getSpansList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        for (Span element : spannable.getSpansList()) {"
         errorLine2="                                      ~~~~~~~~~~~~">
@@ -6005,7 +5780,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (element.getInnerCase()) {"
         errorLine2="                            ~~~~~~~~~~~~">
@@ -6014,7 +5789,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.IMAGE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case IMAGE:"
         errorLine2="                     ~~~~~">
@@ -6023,7 +5798,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    SpanImage protoImage = element.getImage();"
         errorLine2="                                                   ~~~~~~~~">
@@ -6032,7 +5807,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (protoImage.getModifiers().hasClickable()) {"
         errorLine2="                                   ~~~~~~~~~~~~">
@@ -6041,7 +5816,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (protoImage.getModifiers().hasClickable()) {"
         errorLine2="                                                  ~~~~~~~~~~~~">
@@ -6050,7 +5825,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.TEXT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case TEXT:"
         errorLine2="                     ~~~~">
@@ -6059,7 +5834,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    SpanText protoText = element.getText();"
         errorLine2="                                                 ~~~~~~~">
@@ -6068,7 +5843,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (protoText.getModifiers().hasClickable()) {"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -6077,7 +5852,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (protoText.getModifiers().hasClickable()) {"
         errorLine2="                                  ~~~~~~~~~~~~">
@@ -6086,7 +5861,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (protoText.hasAndroidTextStyle()"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~">
@@ -6095,7 +5870,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidTextStyle.getExcludeFontPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            &amp;&amp; protoText.getAndroidTextStyle().getExcludeFontPadding()) {"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~">
@@ -6104,7 +5879,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            &amp;&amp; protoText.getAndroidTextStyle().getExcludeFontPadding()) {"
         errorLine2="                                         ~~~~~~~~~~~~~~~~~~~">
@@ -6113,7 +5888,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        tv.setGravity(horizontalAlignmentToGravity(spannable.getMultilineAlignment().getValue()));"
         errorLine2="                                                                                     ~~~~~~~~">
@@ -6122,7 +5897,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        tv.setGravity(horizontalAlignmentToGravity(spannable.getMultilineAlignment().getValue()));"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~">
@@ -6131,7 +5906,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (spannable.hasMaxLines()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6140,7 +5915,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            tv.setMaxLines(max(TEXT_MIN_LINES, spannable.getMaxLines().getValue()));"
         errorLine2="                                                                       ~~~~~~~~">
@@ -6149,7 +5924,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            tv.setMaxLines(max(TEXT_MIN_LINES, spannable.getMaxLines().getValue()));"
         errorLine2="                                                         ~~~~~~~~~~~">
@@ -6158,7 +5933,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyTextOverflow(tv, spannable.getOverflow(), spannable.getMarqueeParameters());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~~">
@@ -6167,7 +5942,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        applyTextOverflow(tv, spannable.getOverflow(), spannable.getMarqueeParameters());"
         errorLine2="                                        ~~~~~~~~~~~">
@@ -6176,7 +5951,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (spannable.hasLineHeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6185,7 +5960,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new StandardLineHeightSpan((int) toPx(spannable.getLineHeight()));"
         errorLine2="                                                                    ~~~~~~~~~~~~~">
@@ -6194,7 +5969,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasLineSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        } else if (spannable.hasLineSpacing()) {"
         errorLine2="                             ~~~~~~~~~~~~~~">
@@ -6203,7 +5978,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getLineSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            tv.setLineSpacing(toPx(spannable.getLineSpacing()), 1f);"
         errorLine2="                                             ~~~~~~~~~~~~~~">
@@ -6212,7 +5987,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        View wrappedView = applyModifiers(tv, spannable.getModifiers(), posId, pipelineMaker);"
         errorLine2="                                                        ~~~~~~~~~~~~">
@@ -6221,7 +5996,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (element.getInnerCase()) {"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -6230,7 +6005,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ADAPTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ADAPTER:"
         errorLine2="                 ~~~~~~~">
@@ -6239,7 +6014,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getAdapter().getContent(),"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -6248,7 +6023,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getAdapter().getContent(),"
         errorLine2="                                        ~~~~~~~~~~">
@@ -6257,7 +6032,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPACER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPACER:"
         errorLine2="                 ~~~~~~">
@@ -6266,7 +6041,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                parentViewWrapper, element.getSpacer(), nodePosId, pipelineMaker);"
         errorLine2="                                                           ~~~~~~~~~">
@@ -6275,7 +6050,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LINE:"
         errorLine2="                 ~~~~">
@@ -6284,7 +6059,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                parentViewWrapper, element.getLine(), nodePosId, pipelineMaker);"
         errorLine2="                                                           ~~~~~~~">
@@ -6293,7 +6068,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.TEXT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT:"
         errorLine2="                 ~~~~">
@@ -6302,7 +6077,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                parentViewWrapper, element.getText(), nodePosId, pipelineMaker);"
         errorLine2="                                                           ~~~~~~~">
@@ -6311,7 +6086,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -6320,7 +6095,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Log.w(TAG, &quot;No node ID for &quot; + element.getInnerCase().name());"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -6329,7 +6104,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (element.getInnerCase()) {"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -6338,7 +6113,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.COLUMN can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case COLUMN:"
         errorLine2="                 ~~~~~~">
@@ -6347,7 +6122,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getColumn(),"
         errorLine2="                                        ~~~~~~~~~">
@@ -6356,7 +6131,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ROW can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ROW:"
         errorLine2="                 ~~~">
@@ -6365,7 +6140,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getRow(),"
         errorLine2="                                        ~~~~~~">
@@ -6374,7 +6149,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.BOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case BOX:"
         errorLine2="                 ~~~">
@@ -6383,7 +6158,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getBox(),"
         errorLine2="                                        ~~~~~~">
@@ -6392,7 +6167,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPACER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPACER:"
         errorLine2="                 ~~~~~~">
@@ -6401,7 +6176,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                parentViewWrapper, element.getSpacer(), nodePosId, pipelineMaker);"
         errorLine2="                                                           ~~~~~~~~~">
@@ -6410,7 +6185,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.TEXT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT:"
         errorLine2="                 ~~~~">
@@ -6419,7 +6194,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        inflateText(parentViewWrapper, element.getText(), nodePosId, pipelineMaker);"
         errorLine2="                                                               ~~~~~~~">
@@ -6428,7 +6203,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.IMAGE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE:"
         errorLine2="                 ~~~~~">
@@ -6437,7 +6212,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                parentViewWrapper, element.getImage(), nodePosId, pipelineMaker);"
         errorLine2="                                                           ~~~~~~~~">
@@ -6446,7 +6221,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ARC can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC:"
         errorLine2="                 ~~~">
@@ -6455,7 +6230,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getArc(),"
         errorLine2="                                        ~~~~~~">
@@ -6464,7 +6239,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPANNABLE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPANNABLE:"
         errorLine2="                 ~~~~~~~~~">
@@ -6473,7 +6248,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                element.getSpannable(),"
         errorLine2="                                        ~~~~~~~~~~~~">
@@ -6482,7 +6257,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXTENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case EXTENSION:"
         errorLine2="                 ~~~~~~~~~">
@@ -6491,7 +6266,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getExtension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    inflatedView = inflateExtension(parentViewWrapper, element.getExtension());"
         errorLine2="                                                                               ~~~~~~~~~~~~">
@@ -6500,7 +6275,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -6509,7 +6284,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                Log.w(TAG, &quot;Unknown child type: &quot; + element.getInnerCase().name());"
         errorLine2="                                                            ~~~~~~~~~~~~">
@@ -6518,7 +6293,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Log.w(TAG, &quot;Error inflating &quot; + element.getInnerCase().name());"
         errorLine2="                                                    ~~~~~~~~~~~~">
@@ -6527,7 +6302,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Log.w(TAG, &quot;No node ID for &quot; + element.getInnerCase().name());"
         errorLine2="                                                   ~~~~~~~~~~~~">
@@ -6536,7 +6311,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int widthPx = safeDpToPx(element.getWidth().getLinearDimension());"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~">
@@ -6545,7 +6320,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int widthPx = safeDpToPx(element.getWidth().getLinearDimension());"
         errorLine2="                                         ~~~~~~~~">
@@ -6554,7 +6329,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int heightPx = safeDpToPx(element.getHeight().getLinearDimension());"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
@@ -6563,7 +6338,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int heightPx = safeDpToPx(element.getHeight().getLinearDimension());"
         errorLine2="                                          ~~~~~~~~~">
@@ -6572,7 +6347,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getExtensionId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        element.getPayload().toByteArray(), element.getExtensionId());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~">
@@ -6581,7 +6356,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getPayload can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        element.getPayload().toByteArray(), element.getExtensionId());"
         errorLine2="                                ~~~~~~~~~~">
@@ -6590,7 +6365,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int widthPx = safeDpToPx(element.getWidth().getLinearDimension());"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~~">
@@ -6599,7 +6374,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int widthPx = safeDpToPx(element.getWidth().getLinearDimension());"
         errorLine2="                                         ~~~~~~~~">
@@ -6608,7 +6383,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int heightPx = safeDpToPx(element.getHeight().getLinearDimension());"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
@@ -6617,7 +6392,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        int heightPx = safeDpToPx(element.getHeight().getLinearDimension());"
         errorLine2="                                          ~~~~~~~~~">
@@ -6626,7 +6401,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (stringProp.hasDynamicValue() &amp;&amp; pipelineMaker.isPresent()) {"
         errorLine2="                       ~~~~~~~~~~~~~~~">
@@ -6635,7 +6410,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                stringProp.getDynamicValue(),"
         errorLine2="                                           ~~~~~~~~~~~~~~~">
@@ -6644,7 +6419,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                stringProp.getValue(),"
         errorLine2="                                           ~~~~~~~~">
@@ -6653,7 +6428,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                consumer.accept(stringProp.getValue());"
         errorLine2="                                           ~~~~~~~~">
@@ -6662,7 +6437,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            consumer.accept(stringProp.getValue());"
         errorLine2="                                       ~~~~~~~~">
@@ -6671,7 +6446,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (degreesProp.hasDynamicValue() &amp;&amp; pipelineMaker.isPresent()) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -6680,7 +6455,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        .addPipelineFor(degreesProp, degreesProp.getValue(), posId, consumer);"
         errorLine2="                                                                 ~~~~~~~~">
@@ -6689,7 +6464,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                consumer.accept(degreesProp.getValue());"
         errorLine2="                                            ~~~~~~~~">
@@ -6698,7 +6473,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            consumer.accept(degreesProp.getValue());"
         errorLine2="                                        ~~~~~~~~">
@@ -6707,7 +6482,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (dpProp.hasDynamicValue() &amp;&amp; pipelineMaker.isPresent()) {"
         errorLine2="                   ~~~~~~~~~~~~~~~">
@@ -6716,7 +6491,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                pipelineMaker.get().addPipelineFor(dpProp, dpProp.getValue(), posId, consumer);"
         errorLine2="                                                                  ~~~~~~~~">
@@ -6725,7 +6500,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                consumer.accept(dpProp.getValue());"
         errorLine2="                                       ~~~~~~~~">
@@ -6734,7 +6509,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            consumer.accept(dpProp.getValue());"
         errorLine2="                                   ~~~~~~~~">
@@ -6743,7 +6518,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (colorProp.hasDynamicValue() &amp;&amp; pipelineMaker.isPresent()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -6752,7 +6527,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                pipelineMaker.get().addPipelineFor(colorProp, colorProp.getArgb(), posId, consumer);"
         errorLine2="                                                                        ~~~~~~~">
@@ -6761,7 +6536,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                consumer.accept(colorProp.getArgb());"
         errorLine2="                                          ~~~~~~~">
@@ -6770,7 +6545,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            consumer.accept(colorProp.getArgb());"
         errorLine2="                                      ~~~~~~~">
@@ -6779,7 +6554,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (stringProp.hasDynamicValue() &amp;&amp; mDataPipeline.isPresent()) {"
         errorLine2="                       ~~~~~~~~~~~~~~~">
@@ -6788,7 +6563,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (!stringProp.getValueForLayout().isEmpty()) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -6797,7 +6572,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        DpProp dimension = spacerDimension.getLinearDimension();"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
@@ -6806,7 +6581,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (dimension.hasDynamicValue() &amp;&amp; mDataPipeline.isPresent()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -6815,7 +6590,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (dimension.getValueForLayout() > 0f) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
@@ -6824,7 +6599,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (degreesProp.hasDynamicValue() &amp;&amp; mDataPipeline.isPresent()) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -6833,7 +6608,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (degreesProp.getValueForLayout() > 0f) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -6842,7 +6617,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (degreesProp.hasDynamicValue() &amp;&amp; mDataPipeline.isPresent()) {"
         errorLine2="                        ~~~~~~~~~~~~~~~">
@@ -6851,7 +6626,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (degreesProp.getValueForLayout() > 0f) {"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -6860,7 +6635,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return degreesProp.getValueForLayout();"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~">
@@ -6869,7 +6644,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (containerWidth.hasWrappedDimension()"
         errorLine2="                           ~~~~~~~~~~~~~~~~~~~">
@@ -6878,7 +6653,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (containerHeight.hasWrappedDimension()"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~">
@@ -6887,7 +6662,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (element.getInnerCase()) {"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -6896,7 +6671,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.COLUMN can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case COLUMN:"
         errorLine2="                 ~~~~~~">
@@ -6905,7 +6680,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getColumn().getWidth());"
         errorLine2="                                                        ~~~~~~~~">
@@ -6914,7 +6689,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getColumn().getWidth());"
         errorLine2="                                            ~~~~~~~~~">
@@ -6923,7 +6698,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ROW can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ROW:"
         errorLine2="                 ~~~">
@@ -6932,7 +6707,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getRow().getWidth());"
         errorLine2="                                            ~~~~~~">
@@ -6941,7 +6716,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getRow().getWidth());"
         errorLine2="                                                     ~~~~~~~~">
@@ -6950,7 +6725,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.BOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case BOX:"
         errorLine2="                 ~~~">
@@ -6959,7 +6734,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getBox().getWidth());"
         errorLine2="                                                     ~~~~~~~~">
@@ -6968,7 +6743,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getBox().getWidth());"
         errorLine2="                                            ~~~~~~">
@@ -6977,7 +6752,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPACER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPACER:"
         errorLine2="                 ~~~~~~">
@@ -6986,7 +6761,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getSpacer().getWidth());"
         errorLine2="                                            ~~~~~~~~~">
@@ -6995,7 +6770,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getSpacer().getWidth());"
         errorLine2="                                                        ~~~~~~~~">
@@ -7004,7 +6779,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.IMAGE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE:"
         errorLine2="                 ~~~~~">
@@ -7013,7 +6788,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                Image img = element.getImage();"
         errorLine2="                                    ~~~~~~~~">
@@ -7022,7 +6797,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (img.getWidth().hasProportionalDimension()) {"
         errorLine2="                        ~~~~~~~~">
@@ -7031,7 +6806,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (img.getWidth().hasProportionalDimension()) {"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7040,7 +6815,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            (containerHeight.hasExpandedDimension()"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7049,7 +6824,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    || containerHeight.hasLinearDimension());"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
@@ -7058,7 +6833,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return img.getHeight().hasLinearDimension()"
         errorLine2="                               ~~~~~~~~~">
@@ -7067,7 +6842,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return img.getHeight().hasLinearDimension()"
         errorLine2="                                           ~~~~~~~~~~~~~~~~~~">
@@ -7076,7 +6851,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            || (img.getHeight().hasExpandedDimension() &amp;&amp; isContainerHeightKnown);"
         errorLine2="                                    ~~~~~~~~~">
@@ -7085,7 +6860,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            || (img.getHeight().hasExpandedDimension() &amp;&amp; isContainerHeightKnown);"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~">
@@ -7094,7 +6869,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return isMeasurable(element.getImage().getWidth());"
         errorLine2="                                                           ~~~~~~~~">
@@ -7103,7 +6878,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return isMeasurable(element.getImage().getWidth());"
         errorLine2="                                                ~~~~~~~~">
@@ -7112,7 +6887,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ARC can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC:"
         errorLine2="                 ~~~">
@@ -7121,7 +6896,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.TEXT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT:"
         errorLine2="                 ~~~~">
@@ -7130,7 +6905,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPANNABLE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPANNABLE:"
         errorLine2="                 ~~~~~~~~~">
@@ -7139,7 +6914,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -7148,7 +6923,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (element.getInnerCase()) {"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -7157,7 +6932,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.COLUMN can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case COLUMN:"
         errorLine2="                 ~~~~~~">
@@ -7166,7 +6941,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getColumn().getHeight());"
         errorLine2="                                                        ~~~~~~~~~">
@@ -7175,7 +6950,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getColumn().getHeight());"
         errorLine2="                                            ~~~~~~~~~">
@@ -7184,7 +6959,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ROW can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ROW:"
         errorLine2="                 ~~~">
@@ -7193,7 +6968,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getRow().getHeight());"
         errorLine2="                                            ~~~~~~">
@@ -7202,7 +6977,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getRow().getHeight());"
         errorLine2="                                                     ~~~~~~~~~">
@@ -7211,7 +6986,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.BOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case BOX:"
         errorLine2="                 ~~~">
@@ -7220,7 +6995,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getBox().getHeight());"
         errorLine2="                                                     ~~~~~~~~~">
@@ -7229,7 +7004,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getBox().getHeight());"
         errorLine2="                                            ~~~~~~">
@@ -7238,7 +7013,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPACER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPACER:"
         errorLine2="                 ~~~~~~">
@@ -7247,7 +7022,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getSpacer().getHeight());"
         errorLine2="                                            ~~~~~~~~~">
@@ -7256,7 +7031,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return isMeasurable(element.getSpacer().getHeight());"
         errorLine2="                                                        ~~~~~~~~~">
@@ -7265,7 +7040,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.IMAGE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case IMAGE:"
         errorLine2="                 ~~~~~">
@@ -7274,7 +7049,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                Image img = element.getImage();"
         errorLine2="                                    ~~~~~~~~">
@@ -7283,7 +7058,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (img.getHeight().hasProportionalDimension()) {"
         errorLine2="                        ~~~~~~~~~">
@@ -7292,7 +7067,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (img.getHeight().hasProportionalDimension()) {"
         errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7301,7 +7076,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            (containerWidth.hasExpandedDimension()"
         errorLine2="                                            ~~~~~~~~~~~~~~~~~~~~">
@@ -7310,7 +7085,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    || containerWidth.hasLinearDimension());"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~">
@@ -7319,7 +7094,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return img.getWidth().hasLinearDimension()"
         errorLine2="                               ~~~~~~~~">
@@ -7328,7 +7103,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return img.getWidth().hasLinearDimension()"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -7337,7 +7112,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            || (img.getWidth().hasExpandedDimension() &amp;&amp; isContainerWidthKnown);"
         errorLine2="                                    ~~~~~~~~">
@@ -7346,7 +7121,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            || (img.getWidth().hasExpandedDimension() &amp;&amp; isContainerWidthKnown);"
         errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~">
@@ -7355,7 +7130,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return isMeasurable(element.getImage().getHeight());"
         errorLine2="                                                           ~~~~~~~~~">
@@ -7364,7 +7139,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    return isMeasurable(element.getImage().getHeight());"
         errorLine2="                                                ~~~~~~~~">
@@ -7373,7 +7148,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ARC can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC:"
         errorLine2="                 ~~~">
@@ -7382,7 +7157,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.TEXT can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case TEXT:"
         errorLine2="                 ~~~~">
@@ -7391,7 +7166,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPANNABLE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPANNABLE:"
         errorLine2="                 ~~~~~~~~~">
@@ -7400,7 +7175,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -7409,7 +7184,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (dimension.getInnerCase()) {"
         errorLine2="                          ~~~~~~~~~~~~">
@@ -7418,7 +7193,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LINEAR_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -7427,7 +7202,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.PROPORTIONAL_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case PROPORTIONAL_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -7436,7 +7211,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.EXPANDED_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case EXPANDED_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~">
@@ -7445,7 +7220,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -7454,7 +7229,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (dimension.getInnerCase()) {"
         errorLine2="                          ~~~~~~~~~~~~">
@@ -7463,7 +7238,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case LINEAR_DIMENSION:"
         errorLine2="                 ~~~~~~~~~~~~~~~~">
@@ -7472,7 +7247,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case INNER_NOT_SET:"
         errorLine2="                 ~~~~~~~~~~~~~">
@@ -7481,7 +7256,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        mLayoutProto.getRoot(),"
         errorLine2="                                     ~~~~~~~">
@@ -7490,7 +7265,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.hasFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (mLayoutProto.hasFingerprint()) {"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -7499,7 +7274,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    new RenderedMetadata(mLayoutProto.getFingerprint(), layoutInfoBuilder.build()));"
         errorLine2="                                                      ~~~~~~~~~~~~~~">
@@ -7508,25 +7283,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                : checkNotNull("
-        errorLine2="                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                        prevLayoutInfo.getViewPropertiesFor(parentNodePosId));"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutInflater.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                new RenderedMetadata(targetLayout.getFingerprint(), layoutInfoBuilder.build()),"
         errorLine2="                                                  ~~~~~~~~~~~~~~">
@@ -7535,7 +7292,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                prevRenderedMetadata.getTreeFingerprint().getRoot(),"
         errorLine2="                                                          ~~~~~~~">
@@ -7544,7 +7301,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        prevRenderedMetadata.getTreeFingerprint().getRoot(),"
         errorLine2="                                                                  ~~~~~~~">
@@ -7553,7 +7310,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.SEMANTICS_ROLE_IMAGE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SEMANTICS_ROLE_IMAGE:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~">
@@ -7562,7 +7319,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.SEMANTICS_ROLE_BUTTON can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SEMANTICS_ROLE_BUTTON:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -7571,7 +7328,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.SEMANTICS_ROLE_CHECKBOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SEMANTICS_ROLE_CHECKBOX:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7580,7 +7337,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.SEMANTICS_ROLE_SWITCH can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SEMANTICS_ROLE_SWITCH:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~">
@@ -7589,7 +7346,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.SEMANTICS_ROLE_RADIOBUTTON can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SEMANTICS_ROLE_RADIOBUTTON:"
         errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7598,7 +7355,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getRole can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        String className = roleToClassName(semantics.getRole());"
         errorLine2="                                                                     ~~~~~~~">
@@ -7607,7 +7364,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.hasContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (semantics.hasContentDescription()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -7616,7 +7373,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    semantics.getContentDescription(),"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~">
@@ -7625,7 +7382,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getObsoleteContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            view.setContentDescription(semantics.getObsoleteContentDescription());"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7634,7 +7391,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.hasStateDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (semantics.hasStateDescription()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -7643,7 +7400,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getStateDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    semantics.getStateDescription(),"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
@@ -7652,7 +7409,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            Action action = mClickable.getOnClick();"
         errorLine2="                                       ~~~~~~~~~~">
@@ -7661,7 +7418,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getValueCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            switch (action.getValueCase()) {"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7670,7 +7427,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.LAUNCH_ACTION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LAUNCH_ACTION:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -7679,7 +7436,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    action.getLaunchAction(),"
         errorLine2="                                           ~~~~~~~~~~~~~~~">
@@ -7688,7 +7445,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    mClickable.getId(),"
         errorLine2="                                               ~~~~~">
@@ -7697,7 +7454,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.LOAD_ACTION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case LOAD_ACTION:"
         errorLine2="                     ~~~~~~~~~~~">
@@ -7706,7 +7463,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                                    action.getLoadAction(), mClickable.getId())));"
         errorLine2="                                                           ~~~~~~~~~~~~~">
@@ -7715,7 +7472,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                                    action.getLoadAction(), mClickable.getId())));"
         errorLine2="                                                                                       ~~~~~">
@@ -7724,7 +7481,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ValueCase.VALUE_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                case VALUE_NOT_SET:"
         errorLine2="                     ~~~~~~~~~~~~~">
@@ -7733,43 +7490,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                return checkNotNull(array.getFont(styleableResId));"
-        errorLine2="                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                return checkNotNull(array.getFont(styleableResId));"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(array.getString(styleableResId)), Typeface.NORMAL);"
-        errorLine2="                        ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                        checkNotNull(array.getString(styleableResId)), Typeface.NORMAL);"
-        errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.FONT_VARIANT_TITLE_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                FontVariant.FONT_VARIANT_TITLE_VALUE,"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7778,7 +7499,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.FONT_VARIANT_BODY_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                FontVariant.FONT_VARIANT_BODY_VALUE,"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7787,7 +7508,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.FONT_VARIANT_BODY_VALUE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                checkNotNull(mVariantToFontSet.get(FontVariant.FONT_VARIANT_BODY_VALUE));"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7796,70 +7517,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                checkNotNull(mVariantToFontSet.get(FontVariant.FONT_VARIANT_BODY_VALUE));"
-        errorLine2="                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                checkNotNull(mVariantToFontSet.get(FontVariant.FONT_VARIANT_BODY_VALUE));"
-        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/inflater/ProtoLayoutThemeImpl.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                    checkNotNull("
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                            mNewInflateParentData.mInflateResult,"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                            TAG"
-        errorLine2="                            ^">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            return mInflater.applyMutation(checkNotNull(prevInflateParent), mMutation);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            return mInflater.applyMutation(checkNotNull(prevInflateParent), mMutation);"
-        errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                prevRenderedMetadata.getTreeFingerprint(), layout.getFingerprint());"
         errorLine2="                                                                                  ~~~~~~~~~~~~~~">
@@ -7868,7 +7526,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            checkLayoutDepth(layout.getRoot(), MAX_LAYOUT_ELEMENT_DEPTH);"
         errorLine2="                                    ~~~~~~~">
@@ -7877,106 +7535,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            checkNotNull(prevRenderedMetadata);"
-        errorLine2="            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="            checkNotNull(prevRenderedMetadata);"
-        errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="        if (!checkNotNull(mRenderFuture).isDone()) {"
-        errorLine2="             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="        if (!checkNotNull(mRenderFuture).isDone()) {"
-        errorLine2="                          ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                                checkNotNull(mRenderFuture).get(),"
-        errorLine2="                                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                                checkNotNull(mRenderFuture).get(),"
-        errorLine2="                                                             ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                    checkNotNull("
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                    newInflateParentData.mInflateResult,"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                                    TAG"
-        errorLine2="                                    ^">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                ProtoLayoutInflater.clearRenderedMetadata(checkNotNull(prevInflateParent));"
-        errorLine2="                                                          ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.protolayout`)"
-        errorLine1="                ProtoLayoutInflater.clearRenderedMetadata(checkNotNull(prevInflateParent));"
-        errorLine2="                                                                       ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/protolayout/renderer/impl/ProtoLayoutViewInstance.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        switch (layoutElement.getInnerCase()) {"
         errorLine2="                              ~~~~~~~~~~~~">
@@ -7985,7 +7544,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.COLUMN can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case COLUMN:"
         errorLine2="                 ~~~~~~">
@@ -7994,7 +7553,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getColumn().getContentsList();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~">
@@ -8003,7 +7562,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getColumn().getContentsList();"
         errorLine2="                                         ~~~~~~~~~">
@@ -8012,7 +7571,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ROW can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ROW:"
         errorLine2="                 ~~~">
@@ -8021,7 +7580,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getRow().getContentsList();"
         errorLine2="                                         ~~~~~~">
@@ -8030,7 +7589,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getRow().getContentsList();"
         errorLine2="                                                  ~~~~~~~~~~~~~~~">
@@ -8039,7 +7598,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.BOX can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case BOX:"
         errorLine2="                 ~~~">
@@ -8048,7 +7607,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getBox().getContentsList();"
         errorLine2="                                                  ~~~~~~~~~~~~~~~">
@@ -8057,7 +7616,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                children = layoutElement.getBox().getContentsList();"
         errorLine2="                                         ~~~~~~">
@@ -8066,7 +7625,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ARC can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case ARC:"
         errorLine2="                 ~~~">
@@ -8075,7 +7634,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                List&lt;ArcLayoutElement> arcElements = layoutElement.getArc().getContentsList();"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~">
@@ -8084,7 +7643,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                List&lt;ArcLayoutElement> arcElements = layoutElement.getArc().getContentsList();"
         errorLine2="                                                                   ~~~~~~">
@@ -8093,7 +7652,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (element.getInnerCase() == InnerCase.ADAPTER) {"
         errorLine2="                                ~~~~~~~~~~~~">
@@ -8102,7 +7661,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.ADAPTER can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    if (element.getInnerCase() == InnerCase.ADAPTER) {"
         errorLine2="                                                            ~~~~~~~">
@@ -8111,7 +7670,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        checkLayoutDepth(element.getAdapter().getContent(), allowedDepth - 1);"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -8120,7 +7679,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        checkLayoutDepth(element.getAdapter().getContent(), allowedDepth - 1);"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -8129,7 +7688,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.SPANNABLE can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            case SPANNABLE:"
         errorLine2="                 ~~~~~~~~~">
@@ -8138,7 +7697,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (layoutElement.getSpannable().getSpansCount() > 0 &amp;&amp; allowedDepth == 1) {"
         errorLine2="                                  ~~~~~~~~~~~~">
@@ -8147,7 +7706,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getSpansCount can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (layoutElement.getSpannable().getSpansCount() > 0 &amp;&amp; allowedDepth == 1) {"
         errorLine2="                                                 ~~~~~~~~~~~~~">
@@ -8156,7 +7715,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(placeholderResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8165,7 +7724,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (placeholderImageResource.hasAndroidContentUri()) {"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~">
@@ -8174,7 +7733,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(protoResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8183,7 +7742,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(protoResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8192,7 +7751,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource != null &amp;&amp; imageResource.hasAndroidAnimatedResourceByResId()) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8201,7 +7760,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getStartTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return imageResource.getAndroidAnimatedResourceByResId().getStartTrigger();"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~">
@@ -8210,7 +7769,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return imageResource.getAndroidAnimatedResourceByResId().getStartTrigger();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8219,7 +7778,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(protoResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8228,7 +7787,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource != null &amp;&amp; imageResource.hasAndroidSeekableAnimatedResourceByResId()) {"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8237,7 +7796,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getProgress can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return imageResource.getAndroidSeekableAnimatedResourceByResId().getProgress();"
         errorLine2="                                                                             ~~~~~~~~~~~">
@@ -8246,7 +7805,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return imageResource.getAndroidSeekableAnimatedResourceByResId().getProgress();"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8255,7 +7814,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasAndroidAnimatedResourceByResId()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8264,7 +7823,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return resolver.getDrawableOrThrow(imageResource.getAndroidAnimatedResourceByResId());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8273,7 +7832,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasAndroidSeekableAnimatedResourceByResId()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8282,7 +7841,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    imageResource.getAndroidSeekableAnimatedResourceByResId());"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8291,7 +7850,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasAndroidResourceByResId()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8300,7 +7859,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return resolver.getDrawableOrThrow(imageResource.getAndroidResourceByResId());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8309,7 +7868,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasInlineResource() &amp;&amp; mInlineImageResourceResolver != null) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~">
@@ -8318,7 +7877,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return resolver.getDrawableOrThrow(imageResource.getInlineResource());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~">
@@ -8327,7 +7886,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasAndroidContentUri()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~">
@@ -8336,7 +7895,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidContentUri can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return resolver.getDrawable(imageResource.getAndroidContentUri());"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~">
@@ -8345,7 +7904,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(protoResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8354,7 +7913,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (imageResource.hasAndroidResourceByResId()"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8363,7 +7922,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || imageResource.hasAndroidAnimatedResourceByResId()"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8372,7 +7931,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                || imageResource.hasAndroidSeekableAnimatedResourceByResId()) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8381,7 +7940,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mProtoResources.getIdToImageMap().get(originalResourceId);"
         errorLine2="                                ~~~~~~~~~~~~~~~">
diff --git a/wear/protolayout/protolayout/lint-baseline.xml b/wear/protolayout/protolayout/lint-baseline.xml
index d76ba1b..2466ac7 100644
--- a/wear/protolayout/protolayout/lint-baseline.xml
+++ b/wear/protolayout/protolayout/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidStringExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setStringVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setStringVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidStringExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidStringExtra.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidIntExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setIntVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setIntVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidIntExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidIntExtra.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidLongExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setLongVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setLongVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidLongExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidLongExtra.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidDoubleExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setDoubleVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setDoubleVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidDoubleExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidDoubleExtra.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidBooleanExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setBooleanVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setBooleanVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidBooleanExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidBooleanExtra.newBuilder();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasStringVal()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return AndroidStringExtra.fromProto(proto.getStringVal(), fingerprint);"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasIntVal()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return AndroidIntExtra.fromProto(proto.getIntVal(), fingerprint);"
         errorLine2="                                                   ~~~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLongVal()) {"
         errorLine2="                  ~~~~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return AndroidLongExtra.fromProto(proto.getLongVal(), fingerprint);"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasDoubleVal()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return AndroidDoubleExtra.fromProto(proto.getDoubleVal(), fingerprint);"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasBooleanVal()) {"
         errorLine2="                  ~~~~~~~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return AndroidBooleanExtra.fromProto(proto.getBooleanVal(), fingerprint);"
         errorLine2="                                                       ~~~~~~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getPackageName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getPackageName();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getClassName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getClassName();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getKeyToExtraMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    mImpl.getKeyToExtraMap().entrySet()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.AndroidActivity.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPackageName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setPackageName(packageName);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClassName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setClassName(className);"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putKeyToExtra can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.putKeyToExtra(key, extra.toAndroidExtraProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.hasAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidActivity()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.getAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AndroidActivity.fromProto(mImpl.getAndroidActivity());"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLaunchAction(mImpl).build();"
         errorLine2="                                      ~~~~~~~~~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLaunchAction(mImpl).build();"
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.LaunchAction.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -425,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidActivity(androidActivity.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -434,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.hasRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRequestState()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -443,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.getRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return State.fromProto(mImpl.getRequestState());"
         errorLine2="                                             ~~~~~~~~~~~~~~~">
@@ -452,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLoadAction(mImpl).build();"
         errorLine2="                                      ~~~~~~~~~~">
@@ -461,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLoadAction(mImpl).build();"
         errorLine2="                                                   ~~~~~~~~~~~~~">
@@ -470,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ActionProto.LoadAction.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -479,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRequestState(requestState.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -488,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.hasLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLaunchAction()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
@@ -497,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LaunchAction.fromProto(proto.getLaunchAction(), fingerprint);"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -506,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.hasLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLoadAction()) {"
         errorLine2="                  ~~~~~~~~~~~~~">
@@ -515,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LoadAction.fromProto(proto.getLoadAction(), fingerprint);"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -524,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getArgb();"
         errorLine2="                         ~~~~~~~">
@@ -533,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasDynamicValue()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -542,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicColorFromProto(mImpl.getDynamicValue());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -551,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final ColorProto.ColorProp.Builder mImpl = ColorProto.ColorProp.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -560,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setArgb(argb);"
         errorLine2="                      ~~~~~~~">
@@ -569,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDynamicValue(dynamicValue.toDynamicColorProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -578,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasArgb()) {"
         errorLine2="                                                      ~~~~~~~">
@@ -587,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasArgb()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenWidthDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getScreenWidthDp();"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenHeightDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getScreenHeightDp();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenDensity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getScreenDensity();"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getFontScale can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getFontScale();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getDevicePlatform can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDevicePlatform().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DevicePlatform.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDevicePlatform().getNumber();"
         errorLine2="                                             ~~~~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenShape can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getScreenShape().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ScreenShape.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getScreenShape().getNumber();"
         errorLine2="                                          ~~~~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.hasRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRendererSchemaVersion()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VersionInfo.fromProto(mImpl.getRendererSchemaVersion());"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.hasCapabilities can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasCapabilities()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getCapabilities can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Capabilities.fromProto(mImpl.getCapabilities());"
         errorLine2="                                                    ~~~~~~~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DeviceParametersProto.DeviceParameters.newBuilder();"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenWidthDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setScreenWidthDp(screenWidthDp);"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenHeightDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setScreenHeightDp(screenHeightDp);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenDensity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setScreenDensity(screenDensity);"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontScale can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFontScale(fontScale);"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDevicePlatform can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDevicePlatform("
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DevicePlatform.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        DeviceParametersProto.DevicePlatform.forNumber(devicePlatform));"
         errorLine2="                                                             ~~~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenShape can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setScreenShape(DeviceParametersProto.ScreenShape.forNumber(screenShape));"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ScreenShape.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setScreenShape(DeviceParametersProto.ScreenShape.forNumber(screenShape));"
         errorLine2="                                                                       ~~~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRendererSchemaVersion(rendererSchemaVersion.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCapabilities can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setCapabilities(capabilities.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Capabilities.getMinimumFreshnessLimitMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getMinimumFreshnessLimitMillis();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Capabilities.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DeviceParametersProto.Capabilities.newBuilder();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMinimumFreshnessLimitMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMinimumFreshnessLimitMillis(minimumFreshnessLimitMillis);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasDynamicValue()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicFloatFromProto(mImpl.getDynamicValue());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ExtensionDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ExtensionDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final DimensionProto.DpProp.Builder mImpl = DimensionProto.DpProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(staticValue);"
         errorLine2="                      ~~~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDynamicValue(dynamicValue.toDynamicFloatProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                                                      ~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValueForLayout();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.DpProp.newBuilder();"
         errorLine2="                                          ~~~~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValueForLayout(value);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getHorizontalAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getHorizontalAlignmentForLayoutValue();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHorizontalAlignmentForLayoutValue(horizontalAlignment);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getVerticalAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getVerticalAlignmentForLayoutValue();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVerticalAlignmentForLayoutValue(verticalAlignment);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final DimensionProto.SpProp.Builder mImpl = DimensionProto.SpProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final DimensionProto.EmProp.Builder mImpl = DimensionProto.EmProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasDynamicValue()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicFloatFromProto(mImpl.getDynamicValue());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.DegreesProp.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(staticValue);"
         errorLine2="                      ~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDynamicValue(dynamicValue.toDynamicFloatProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                                                      ~~~~~~~~">
@@ -1181,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValueForLayout();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -1190,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getAngularAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAngularAlignmentForLayoutValue();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1199,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.DegreesProp.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -1208,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValueForLayout(value);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -1217,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAngularAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAngularAlignmentForLayoutValue(angularAlignment);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1226,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.hasLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLayoutWeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -1235,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.getLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FloatProp.fromProto(mImpl.getLayoutWeight());"
         errorLine2="                                                 ~~~~~~~~~~~~~~~">
@@ -1244,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1253,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    .setExpandedDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -1262,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setExpandedDimension(mImpl).build();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~">
@@ -1271,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setExpandedDimension(mImpl).build();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1280,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.ExpandedDimensionProp.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -1289,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLayoutWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLayoutWeight(layoutWeight.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -1298,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.hasMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMinimumSize()) {"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -1307,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.getMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getMinimumSize());"
         errorLine2="                                              ~~~~~~~~~~~~~~">
@@ -1316,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1325,7 +1325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    .setWrappedDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
@@ -1334,7 +1334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.WrappedDimensionProp.newBuilder();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -1343,7 +1343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMinimumSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMinimumSize(minimumSize.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -1352,7 +1352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAspectRatioWidth();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
@@ -1361,7 +1361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAspectRatioHeight();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1370,7 +1370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder()"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1379,7 +1379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    .setProportionalDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1388,7 +1388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    DimensionProto.ProportionalDimensionProp.newBuilder();"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -1397,7 +1397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAspectRatioWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAspectRatioWidth(aspectRatioWidth);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -1406,7 +1406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAspectRatioHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAspectRatioHeight(aspectRatioHeight);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -1415,7 +1415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1424,7 +1424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1433,7 +1433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasExpandedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
@@ -1442,7 +1442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ExpandedDimensionProp.fromProto(proto.getExpandedDimension(), fingerprint);"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1451,7 +1451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasWrappedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
@@ -1460,7 +1460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return WrappedDimensionProp.fromProto(proto.getWrappedDimension(), fingerprint);"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -1469,7 +1469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1478,7 +1478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1487,7 +1487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasExpandedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
@@ -1496,7 +1496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ExpandedDimensionProp.fromProto(proto.getExpandedDimension(), fingerprint);"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1505,7 +1505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasProportionalDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1514,7 +1514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    proto.getProportionalDimension(), fingerprint);"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1523,7 +1523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1532,7 +1532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1541,7 +1541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1550,7 +1550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1559,7 +1559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1568,7 +1568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1577,7 +1577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.FontWeightProp.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -1586,7 +1586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontWeight.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1595,7 +1595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontWeight.forNumber(value));"
         errorLine2="                                                             ~~~~~~~~~">
@@ -1604,7 +1604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1613,7 +1613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1622,7 +1622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.FontVariantProp.newBuilder();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -1631,7 +1631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontVariant.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1640,7 +1640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontVariant.forNumber(value));"
         errorLine2="                                                              ~~~~~~~~~">
@@ -1649,7 +1649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1658,7 +1658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1667,7 +1667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.SpanVerticalAlignmentProp.newBuilder();"
         errorLine2="                                                                 ~~~~~~~~~~">
@@ -1676,7 +1676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.SpanVerticalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1685,7 +1685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.SpanVerticalAlignment.forNumber(value));"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -1694,7 +1694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasSize()) {"
         errorLine2="                      ~~~~~~~">
@@ -1703,7 +1703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpProp.fromProto(mImpl.getSize());"
         errorLine2="                                              ~~~~~~~">
@@ -1712,7 +1712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasItalic()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -1721,7 +1721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return BoolProp.fromProto(mImpl.getItalic());"
         errorLine2="                                                ~~~~~~~~~">
@@ -1730,7 +1730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasUnderline()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -1739,7 +1739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return BoolProp.fromProto(mImpl.getUnderline());"
         errorLine2="                                                ~~~~~~~~~~~~">
@@ -1748,7 +1748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -1757,7 +1757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                 ~~~~~~~~">
@@ -1766,7 +1766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -1775,7 +1775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FontWeightProp.fromProto(mImpl.getWeight());"
         errorLine2="                                                      ~~~~~~~~~">
@@ -1784,7 +1784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLetterSpacing()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -1793,7 +1793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return EmProp.fromProto(mImpl.getLetterSpacing());"
         errorLine2="                                              ~~~~~~~~~~~~~~~~">
@@ -1802,7 +1802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasVariant()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -1811,7 +1811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FontVariantProp.fromProto(mImpl.getVariant());"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -1820,7 +1820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.FontStyle.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1829,7 +1829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSize(size.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -1838,7 +1838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setItalic(italic.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -1847,7 +1847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setUnderline(underline.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -1856,7 +1856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -1865,7 +1865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWeight(weight.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -1874,7 +1874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLetterSpacing(letterSpacing.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -1883,7 +1883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVariant(variant.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -1892,7 +1892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVariant("
         errorLine2="                      ~~~~~~~~~~">
@@ -1901,7 +1901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        LayoutElementProto.FontVariantProp.newBuilder()"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -1910,7 +1910,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                .setValue(LayoutElementProto.FontVariant.forNumber(variant)));"
         errorLine2="                                 ~~~~~~~~">
@@ -1919,7 +1919,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                .setValue(LayoutElementProto.FontVariant.forNumber(variant)));"
         errorLine2="                                                                         ~~~~~~~~~">
@@ -1928,7 +1928,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1937,7 +1937,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1946,7 +1946,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.TextOverflowProp.newBuilder();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -1955,7 +1955,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.TextOverflow.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1964,7 +1964,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.TextOverflow.forNumber(value));"
         errorLine2="                                                               ~~~~~~~~~">
@@ -1973,7 +1973,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.getIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getIterations();"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -1982,7 +1982,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.MarqueeParameters.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -1991,7 +1991,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setIterations(iterations);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2000,7 +2000,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidTextStyle.getExcludeFontPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getExcludeFontPadding();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
@@ -2009,7 +2009,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidTextStyle.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.AndroidTextStyle.newBuilder();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -2018,7 +2018,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExcludeFontPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setExcludeFontPadding(excludeFontPadding);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -2027,7 +2027,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -2036,7 +2036,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                  ~~~~~~~">
@@ -2045,7 +2045,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -2054,7 +2054,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringLayoutConstraint.fromProto(mImpl.getText());"
         errorLine2="                                                              ~~~~~~~">
@@ -2063,7 +2063,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2072,7 +2072,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -2081,7 +2081,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2090,7 +2090,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -2099,7 +2099,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMaxLines()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2108,7 +2108,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Int32Prop.fromProto(mImpl.getMaxLines());"
         errorLine2="                                                 ~~~~~~~~~~~">
@@ -2117,7 +2117,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMultilineAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -2126,7 +2126,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return TextAlignmentProp.fromProto(mImpl.getMultilineAlignment());"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~">
@@ -2135,7 +2135,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasOverflow()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2144,7 +2144,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return TextOverflowProp.fromProto(mImpl.getOverflow());"
         errorLine2="                                                        ~~~~~~~~~~~">
@@ -2153,7 +2153,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLineHeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2162,7 +2162,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpProp.fromProto(mImpl.getLineHeight());"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -2171,7 +2171,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidTextStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -2180,7 +2180,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AndroidTextStyle.fromProto(mImpl.getAndroidTextStyle());"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -2189,7 +2189,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.getIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getMarqueeParameters().getIterations();"
         errorLine2="                                                ~~~~~~~~~~~~~">
@@ -2198,7 +2198,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getMarqueeParameters().getIterations();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -2207,7 +2207,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~">
@@ -2216,7 +2216,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2225,7 +2225,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Text.newBuilder();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -2234,7 +2234,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.mergeText(text.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2243,7 +2243,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.mergeText(stringLayoutConstraint.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2252,7 +2252,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2261,7 +2261,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2270,7 +2270,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMaxLines(maxLines.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2279,7 +2279,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMultilineAlignment(multilineAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -2288,7 +2288,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setOverflow(overflow.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2297,7 +2297,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLineHeight(lineHeight.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2306,7 +2306,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidTextStyle(androidTextStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -2315,7 +2315,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMarqueeParameters("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -2324,7 +2324,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        LayoutElementProto.MarqueeParameters.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -2333,7 +2333,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                .setIterations(marqueeIterations));"
         errorLine2="                                 ~~~~~~~~~~~~~">
@@ -2342,7 +2342,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                TypesProto.StringProp text = mImpl.getText();"
         errorLine2="                                                   ~~~~~~~">
@@ -2351,7 +2351,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (text.hasDynamicValue() &amp;&amp; !text.hasValueForLayout()) {"
         errorLine2="                         ~~~~~~~~~~~~~~~">
@@ -2360,7 +2360,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.hasValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (text.hasDynamicValue() &amp;&amp; !text.hasValueForLayout()) {"
         errorLine2="                                                    ~~~~~~~~~~~~~~~~~">
@@ -2369,7 +2369,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -2378,7 +2378,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -2387,7 +2387,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ContentScaleModeProp.newBuilder();"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -2396,7 +2396,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.ContentScaleMode.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -2405,7 +2405,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.ContentScaleMode.forNumber(value));"
         errorLine2="                                                                   ~~~~~~~~~">
@@ -2414,7 +2414,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.hasTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasTint()) {"
         errorLine2="                      ~~~~~~~">
@@ -2423,7 +2423,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.getTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorProp.fromProto(mImpl.getTint());"
         errorLine2="                                                 ~~~~~~~">
@@ -2432,7 +2432,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ColorFilter.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -2441,7 +2441,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTint(tint.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -2450,7 +2450,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasResourceId()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2459,7 +2459,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getResourceId());"
         errorLine2="                                                  ~~~~~~~~~~~~~">
@@ -2468,7 +2468,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -2477,7 +2477,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.imageDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                       ~~~~~~~~">
@@ -2486,7 +2486,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2495,7 +2495,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.imageDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                       ~~~~~~~~~">
@@ -2504,7 +2504,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasContentScaleMode()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -2513,7 +2513,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ContentScaleModeProp.fromProto(mImpl.getContentScaleMode());"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
@@ -2522,7 +2522,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2531,7 +2531,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -2540,7 +2540,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasColorFilter()) {"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -2549,7 +2549,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorFilter.fromProto(mImpl.getColorFilter());"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -2558,7 +2558,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~">
@@ -2567,7 +2567,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2576,7 +2576,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Image.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -2585,7 +2585,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setResourceId(resourceId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2594,7 +2594,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toImageDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -2603,7 +2603,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toImageDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2612,7 +2612,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setContentScaleMode(contentScaleMode.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -2621,7 +2621,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2630,7 +2630,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setColorFilter(colorFilter.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -2639,7 +2639,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -2648,7 +2648,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.spacerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                        ~~~~~~~~">
@@ -2657,7 +2657,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.getWidth().hasLinearDimension()) {"
         errorLine2="                      ~~~~~~~~">
@@ -2666,7 +2666,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.getWidth().hasLinearDimension()) {"
         errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
@@ -2675,7 +2675,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return HorizontalLayoutConstraint.fromProto(mImpl.getWidth().getLinearDimension());"
         errorLine2="                                                                  ~~~~~~~~">
@@ -2684,7 +2684,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return HorizontalLayoutConstraint.fromProto(mImpl.getWidth().getLinearDimension());"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~">
@@ -2693,7 +2693,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2702,7 +2702,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.spacerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -2711,7 +2711,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.getHeight().hasLinearDimension()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2720,7 +2720,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.getHeight().hasLinearDimension()) {"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~">
@@ -2729,7 +2729,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VerticalLayoutConstraint.fromProto(mImpl.getHeight().getLinearDimension());"
         errorLine2="                                                                ~~~~~~~~~">
@@ -2738,7 +2738,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VerticalLayoutConstraint.fromProto(mImpl.getHeight().getLinearDimension());"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~">
@@ -2747,7 +2747,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2756,7 +2756,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -2765,7 +2765,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -2774,7 +2774,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2783,7 +2783,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Spacer.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -2792,7 +2792,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.mergeWidth(width.toSpacerDimensionProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -2801,7 +2801,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                switch (mImpl.getWidth().getInnerCase()) {"
         errorLine2="                              ~~~~~~~~">
@@ -2810,7 +2810,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                switch (mImpl.getWidth().getInnerCase()) {"
         errorLine2="                                         ~~~~~~~~~~~~">
@@ -2819,7 +2819,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case INNER_NOT_SET:"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -2828,7 +2828,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case LINEAR_DIMENSION:"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -2837,7 +2837,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        mImpl.mergeWidth(horizontalLayoutConstraint.toSpacerDimensionProto());"
         errorLine2="                              ~~~~~~~~~~">
@@ -2846,7 +2846,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toSpacerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2855,7 +2855,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                switch (mImpl.getHeight().getInnerCase()) {"
         errorLine2="                              ~~~~~~~~~">
@@ -2864,7 +2864,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getInnerCase can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                switch (mImpl.getHeight().getInnerCase()) {"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -2873,7 +2873,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.INNER_NOT_SET can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case INNER_NOT_SET:"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -2882,7 +2882,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InnerCase.LINEAR_DIMENSION can only be accessed from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    case LINEAR_DIMENSION:"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -2891,7 +2891,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        mImpl.mergeHeight(verticalLayoutConstraint.toSpacerDimensionProto());"
         errorLine2="                              ~~~~~~~~~~~">
@@ -2900,7 +2900,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2909,7 +2909,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                DimensionProto.DpProp width = mImpl.getWidth().getLinearDimension();"
         errorLine2="                                                    ~~~~~~~~">
@@ -2918,7 +2918,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                DimensionProto.DpProp width = mImpl.getWidth().getLinearDimension();"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -2927,7 +2927,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (width.hasDynamicValue() &amp;&amp; !width.hasValueForLayout()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -2936,7 +2936,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (width.hasDynamicValue() &amp;&amp; !width.hasValueForLayout()) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~">
@@ -2945,7 +2945,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                DimensionProto.DpProp height = mImpl.getHeight().getLinearDimension();"
         errorLine2="                                                     ~~~~~~~~~">
@@ -2954,7 +2954,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                DimensionProto.DpProp height = mImpl.getHeight().getLinearDimension();"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
@@ -2963,7 +2963,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (height.hasDynamicValue() &amp;&amp; !height.hasValueForLayout()) {"
         errorLine2="                           ~~~~~~~~~~~~~~~">
@@ -2972,7 +2972,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.hasValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (height.hasDynamicValue() &amp;&amp; !height.hasValueForLayout()) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
@@ -2981,7 +2981,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (LayoutElementProto.LayoutElement item : mImpl.getContentsList()) {"
         errorLine2="                                                               ~~~~~~~~~~~~~~~">
@@ -2990,7 +2990,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2999,7 +2999,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -3008,7 +3008,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3017,7 +3017,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -3026,7 +3026,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHorizontalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3035,7 +3035,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getHorizontalAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3044,7 +3044,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasVerticalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -3053,7 +3053,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlignment());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3062,7 +3062,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3071,7 +3071,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3080,7 +3080,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setBox(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -3089,7 +3089,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setBox(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -3098,7 +3098,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Box.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -3107,7 +3107,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3116,7 +3116,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -3125,7 +3125,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -3134,7 +3134,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHorizontalAlignment(horizontalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3143,7 +3143,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVerticalAlignment(verticalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -3152,7 +3152,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3161,7 +3161,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -3170,7 +3170,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                  ~~~~~~~">
@@ -3179,7 +3179,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3188,7 +3188,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3197,7 +3197,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3206,7 +3206,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpanModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -3215,7 +3215,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidTextStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -3224,7 +3224,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AndroidTextStyle.fromProto(mImpl.getAndroidTextStyle());"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -3233,7 +3233,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setText(mImpl).build();"
         errorLine2="                                                        ~~~~~~~">
@@ -3242,7 +3242,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setText(mImpl).build();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -3251,7 +3251,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.SpanText.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -3260,7 +3260,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setText(text.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -3269,7 +3269,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3278,7 +3278,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3287,7 +3287,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidTextStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidTextStyle(androidTextStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -3296,7 +3296,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasResourceId()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3305,7 +3305,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getResourceId());"
         errorLine2="                                                  ~~~~~~~~~~~~~">
@@ -3314,7 +3314,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3323,7 +3323,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getWidth());"
         errorLine2="                                              ~~~~~~~~">
@@ -3332,7 +3332,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -3341,7 +3341,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getHeight());"
         errorLine2="                                              ~~~~~~~~~">
@@ -3350,7 +3350,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3359,7 +3359,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpanModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -3368,7 +3368,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3377,7 +3377,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpanVerticalAlignmentProp.fromProto(mImpl.getAlignment());"
         errorLine2="                                                                 ~~~~~~~~~~~~">
@@ -3386,7 +3386,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                        ~~~~~~~~">
@@ -3395,7 +3395,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setImage(mImpl).build();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -3404,7 +3404,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.SpanImage.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -3413,7 +3413,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setResourceId(resourceId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3422,7 +3422,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -3431,7 +3431,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -3440,7 +3440,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3449,7 +3449,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAlignment(alignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3458,7 +3458,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -3467,7 +3467,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return SpanText.fromProto(proto.getText(), fingerprint);"
         errorLine2="                                            ~~~~~~~">
@@ -3476,7 +3476,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.hasImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasImage()) {"
         errorLine2="                  ~~~~~~~~">
@@ -3485,7 +3485,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return SpanImage.fromProto(proto.getImage(), fingerprint);"
         errorLine2="                                             ~~~~~~~~">
@@ -3494,7 +3494,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getSpansList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (LayoutElementProto.Span item : mImpl.getSpansList()) {"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -3503,7 +3503,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3512,7 +3512,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3521,7 +3521,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMaxLines()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3530,7 +3530,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Int32Prop.fromProto(mImpl.getMaxLines());"
         errorLine2="                                                 ~~~~~~~~~~~">
@@ -3539,7 +3539,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMultilineAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -3548,7 +3548,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getMultilineAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~">
@@ -3557,7 +3557,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasOverflow()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3566,7 +3566,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return TextOverflowProp.fromProto(mImpl.getOverflow());"
         errorLine2="                                                        ~~~~~~~~~~~">
@@ -3575,7 +3575,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLineHeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3584,7 +3584,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SpProp.fromProto(mImpl.getLineHeight());"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -3593,7 +3593,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.getIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getMarqueeParameters().getIterations();"
         errorLine2="                                                ~~~~~~~~~~~~~">
@@ -3602,7 +3602,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getMarqueeParameters().getIterations();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -3611,7 +3611,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpannable(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~~~~">
@@ -3620,7 +3620,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpannable(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -3629,7 +3629,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Spannable.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -3638,7 +3638,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addSpans can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addSpans(span.toSpanProto());"
         errorLine2="                      ~~~~~~~~">
@@ -3647,7 +3647,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3656,7 +3656,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMaxLines(maxLines.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3665,7 +3665,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMultilineAlignment(multilineAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -3674,7 +3674,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setOverflow(overflow.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3683,7 +3683,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLineHeight(lineHeight.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3692,7 +3692,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMarqueeParameters can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMarqueeParameters("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -3701,7 +3701,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="MarqueeParameters.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        LayoutElementProto.MarqueeParameters.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -3710,7 +3710,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIterations can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                .setIterations(marqueeIterations));"
         errorLine2="                                 ~~~~~~~~~~~~~">
@@ -3719,7 +3719,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (LayoutElementProto.LayoutElement item : mImpl.getContentsList()) {"
         errorLine2="                                                               ~~~~~~~~~~~~~~~">
@@ -3728,7 +3728,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHorizontalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3737,7 +3737,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getHorizontalAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3746,7 +3746,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3755,7 +3755,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -3764,7 +3764,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -3773,7 +3773,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -3782,7 +3782,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3791,7 +3791,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3800,7 +3800,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setColumn(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -3809,7 +3809,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setColumn(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -3818,7 +3818,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Column.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -3827,7 +3827,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3836,7 +3836,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHorizontalAlignment(horizontalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3845,7 +3845,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -3854,7 +3854,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -3863,7 +3863,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3872,7 +3872,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (LayoutElementProto.LayoutElement item : mImpl.getContentsList()) {"
         errorLine2="                                                               ~~~~~~~~~~~~~~~">
@@ -3881,7 +3881,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasVerticalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -3890,7 +3890,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlignment());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3899,7 +3899,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3908,7 +3908,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -3917,7 +3917,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -3926,7 +3926,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -3935,7 +3935,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3944,7 +3944,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -3953,7 +3953,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setRow(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -3962,7 +3962,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setRow(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -3971,7 +3971,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Row.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -3980,7 +3980,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3989,7 +3989,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVerticalAlignment(verticalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -3998,7 +3998,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVerticalAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -4007,7 +4007,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        AlignmentProto.VerticalAlignmentProp.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -4016,7 +4016,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -4025,7 +4025,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                        AlignmentProto.VerticalAlignment.forNumber("
         errorLine2="                                                                         ~~~~~~~~~">
@@ -4034,7 +4034,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -4043,7 +4043,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -4052,7 +4052,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4061,7 +4061,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (LayoutElementProto.ArcLayoutElement item : mImpl.getContentsList()) {"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~">
@@ -4070,7 +4070,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnchorAngle()) {"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -4079,7 +4079,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DegreesProp.fromProto(mImpl.getAnchorAngle());"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -4088,7 +4088,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnchorType()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -4097,7 +4097,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ArcAnchorTypeProp.fromProto(mImpl.getAnchorType());"
         errorLine2="                                                         ~~~~~~~~~~~~~">
@@ -4106,7 +4106,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasVerticalAlign()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -4115,7 +4115,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlign());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~">
@@ -4124,7 +4124,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4133,7 +4133,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -4142,7 +4142,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setArc(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -4151,7 +4151,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setArc(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -4160,7 +4160,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Arc.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -4169,7 +4169,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addContents(content.toArcLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -4178,7 +4178,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnchorAngle(anchorAngle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -4187,7 +4187,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnchorType(anchorType.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -4196,7 +4196,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVerticalAlign(verticalAlign.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -4205,7 +4205,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4214,7 +4214,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -4223,7 +4223,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                  ~~~~~~~">
@@ -4232,7 +4232,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4241,7 +4241,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -4250,7 +4250,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4259,7 +4259,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                    ~~~~~~~~~~~~">
@@ -4268,7 +4268,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -4277,7 +4277,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~">
@@ -4286,7 +4286,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ArcText.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -4295,7 +4295,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setText(text.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -4304,7 +4304,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4313,7 +4313,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4322,7 +4322,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLength()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4331,7 +4331,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DegreesProp.fromProto(mImpl.getLength());"
         errorLine2="                                                   ~~~~~~~~~">
@@ -4340,7 +4340,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLength()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4349,7 +4349,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AngularLayoutConstraint.fromProto(mImpl.getLength());"
         errorLine2="                                                               ~~~~~~~~~">
@@ -4358,7 +4358,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasThickness()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4367,7 +4367,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getThickness());"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -4376,7 +4376,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -4385,7 +4385,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                 ~~~~~~~~">
@@ -4394,7 +4394,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4403,7 +4403,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                    ~~~~~~~~~~~~">
@@ -4412,7 +4412,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasStrokeCap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasStrokeCap()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4421,7 +4421,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getStrokeCap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StrokeCapProp.fromProto(mImpl.getStrokeCap());"
         errorLine2="                                                     ~~~~~~~~~~~~">
@@ -4430,7 +4430,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setLine(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -4439,7 +4439,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setLine(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~">
@@ -4448,7 +4448,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ArcLine.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -4457,7 +4457,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.mergeLength(length.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -4466,7 +4466,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.mergeLength(angularLayoutConstraint.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -4475,7 +4475,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setThickness(thickness.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4484,7 +4484,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -4493,7 +4493,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4502,7 +4502,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStrokeCap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setStrokeCap(strokeCap.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4511,7 +4511,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                DimensionProto.DegreesProp length = mImpl.getLength();"
         errorLine2="                                                          ~~~~~~~~~">
@@ -4520,7 +4520,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (length.hasDynamicValue() &amp;&amp; !length.hasValueForLayout()) {"
         errorLine2="                           ~~~~~~~~~~~~~~~">
@@ -4529,7 +4529,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.hasValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (length.hasDynamicValue() &amp;&amp; !length.hasValueForLayout()) {"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~">
@@ -4538,7 +4538,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -4547,7 +4547,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCapProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -4556,7 +4556,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCapProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.StrokeCapProp.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -4565,7 +4565,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.StrokeCap.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -4574,7 +4574,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StrokeCap.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.StrokeCap.forNumber(value));"
         errorLine2="                                                            ~~~~~~~~~">
@@ -4583,7 +4583,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLength()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4592,7 +4592,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DegreesProp.fromProto(mImpl.getLength());"
         errorLine2="                                                   ~~~~~~~~~">
@@ -4601,7 +4601,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasThickness()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4610,7 +4610,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getThickness());"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -4619,7 +4619,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4628,7 +4628,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                    ~~~~~~~~~~~~">
@@ -4637,7 +4637,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -4646,7 +4646,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -4655,7 +4655,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ArcSpacer.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -4664,7 +4664,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLength(length.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -4673,7 +4673,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setThickness(thickness.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4682,7 +4682,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4691,7 +4691,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.hasContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasContent()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -4700,7 +4700,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return LayoutElementBuilders.layoutElementFromProto(mImpl.getContent());"
         errorLine2="                                                                          ~~~~~~~~~~">
@@ -4709,7 +4709,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.hasRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRotateContents()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -4718,7 +4718,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return BoolProp.fromProto(mImpl.getRotateContents());"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~">
@@ -4727,7 +4727,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setAdapter(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -4736,7 +4736,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setAdapter(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~~~~">
@@ -4745,7 +4745,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ArcAdapter.newBuilder();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -4754,7 +4754,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setContent(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -4763,7 +4763,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRotateContents(rotateContents.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -4772,7 +4772,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getPayload can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getPayload().toByteArray();"
         errorLine2="                         ~~~~~~~~~~">
@@ -4781,7 +4781,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getExtensionId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getExtensionId();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -4790,7 +4790,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -4799,7 +4799,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.extensionDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -4808,7 +4808,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4817,7 +4817,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DimensionBuilders.extensionDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -4826,7 +4826,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExtension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setExtension(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~~~~">
@@ -4835,7 +4835,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setExtension(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -4844,7 +4844,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExtensionLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.ExtensionLayoutElement.newBuilder();"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -4853,7 +4853,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPayload can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setPayload(ByteString.copyFrom(payload));"
         errorLine2="                      ~~~~~~~~~~">
@@ -4862,7 +4862,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExtensionId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setExtensionId(extensionId);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -4871,7 +4871,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toExtensionDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -4880,7 +4880,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeight(height.toExtensionDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -4889,7 +4889,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasColumn()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -4898,7 +4898,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Column.fromProto(proto.getColumn(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~">
@@ -4907,7 +4907,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasRow()) {"
         errorLine2="                  ~~~~~~">
@@ -4916,7 +4916,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Row.fromProto(proto.getRow(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -4925,7 +4925,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasBox()) {"
         errorLine2="                  ~~~~~~">
@@ -4934,7 +4934,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Box.fromProto(proto.getBox(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -4943,7 +4943,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasSpacer()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -4952,7 +4952,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Spacer.fromProto(proto.getSpacer(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~">
@@ -4961,7 +4961,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -4970,7 +4970,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Text.fromProto(proto.getText(), fingerprint);"
         errorLine2="                                        ~~~~~~~">
@@ -4979,7 +4979,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasImage()) {"
         errorLine2="                  ~~~~~~~~">
@@ -4988,7 +4988,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Image.fromProto(proto.getImage(), fingerprint);"
         errorLine2="                                         ~~~~~~~~">
@@ -4997,7 +4997,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasArc()) {"
         errorLine2="                  ~~~~~~">
@@ -5006,7 +5006,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Arc.fromProto(proto.getArc(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -5015,7 +5015,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasSpannable()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -5024,7 +5024,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return Spannable.fromProto(proto.getSpannable(), fingerprint);"
         errorLine2="                                             ~~~~~~~~~~~~">
@@ -5033,7 +5033,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasExtension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasExtension()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -5042,7 +5042,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getExtension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ExtensionLayoutElement.fromProto(proto.getExtension(), fingerprint);"
         errorLine2="                                                          ~~~~~~~~~~~~">
@@ -5051,7 +5051,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -5060,7 +5060,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ArcText.fromProto(proto.getText(), fingerprint);"
         errorLine2="                                           ~~~~~~~">
@@ -5069,7 +5069,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasLine()) {"
         errorLine2="                  ~~~~~~~">
@@ -5078,7 +5078,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ArcLine.fromProto(proto.getLine(), fingerprint);"
         errorLine2="                                           ~~~~~~~">
@@ -5087,7 +5087,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasSpacer()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -5096,7 +5096,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ArcSpacer.fromProto(proto.getSpacer(), fingerprint);"
         errorLine2="                                             ~~~~~~~~~">
@@ -5105,7 +5105,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasAdapter()) {"
         errorLine2="                  ~~~~~~~~~~">
@@ -5114,7 +5114,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ArcAdapter.fromProto(proto.getAdapter(), fingerprint);"
         errorLine2="                                              ~~~~~~~~~~">
@@ -5123,7 +5123,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.hasRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRoot()) {"
         errorLine2="                      ~~~~~~~">
@@ -5132,7 +5132,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return LayoutElementBuilders.layoutElementFromProto(mImpl.getRoot());"
         errorLine2="                                                                          ~~~~~~~">
@@ -5141,7 +5141,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.parseFrom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return fromProto(LayoutElementProto.Layout.parseFrom(byteArray));"
         errorLine2="                                                           ~~~~~~~~~">
@@ -5150,7 +5150,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    LayoutElementProto.Layout.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -5159,7 +5159,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRoot(root.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~">
@@ -5168,7 +5168,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    mImpl.setFingerprint("
         errorLine2="                          ~~~~~~~~~~~~~~">
@@ -5177,7 +5177,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            TreeFingerprint.newBuilder().setRoot(fingerprintToProto(fingerprint)));"
         errorLine2="                                                         ~~~~~~~">
@@ -5186,7 +5186,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                            TreeFingerprint.newBuilder().setRoot(fingerprintToProto(fingerprint)));"
         errorLine2="                                            ~~~~~~~~~~">
@@ -5195,7 +5195,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        FingerprintProto.NodeFingerprint.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -5204,7 +5204,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    builder.setSelfTypeValue(fingerprint.selfTypeValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -5213,7 +5213,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    builder.setSelfPropsValue(fingerprint.selfPropsValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -5222,7 +5222,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    builder.setChildNodesValue(fingerprint.childNodesValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
@@ -5231,7 +5231,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addChildNodes can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    builder.addChildNodes(fingerprintToProto(childNode));"
         errorLine2="                            ~~~~~~~~~~~~~">
@@ -5240,7 +5240,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -5249,7 +5249,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -5258,7 +5258,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    AlignmentProto.HorizontalAlignmentProp.newBuilder();"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -5267,7 +5267,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.HorizontalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -5276,7 +5276,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.HorizontalAlignment.forNumber(value));"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -5285,7 +5285,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -5294,7 +5294,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -5303,7 +5303,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    AlignmentProto.VerticalAlignmentProp.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -5312,7 +5312,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.VerticalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -5321,7 +5321,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.VerticalAlignment.forNumber(value));"
         errorLine2="                                                                ~~~~~~~~~">
@@ -5330,7 +5330,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -5339,7 +5339,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -5348,7 +5348,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    AlignmentProto.TextAlignmentProp.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -5357,7 +5357,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.TextAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -5366,7 +5366,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.TextAlignment.forNumber(value));"
         errorLine2="                                                            ~~~~~~~~~">
@@ -5375,7 +5375,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -5384,7 +5384,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -5393,7 +5393,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    AlignmentProto.ArcAnchorTypeProp.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -5402,7 +5402,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.ArcAnchorType.forNumber(value));"
         errorLine2="                                                            ~~~~~~~~~">
@@ -5411,7 +5411,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(AlignmentProto.ArcAnchorType.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -5420,7 +5420,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getId();"
         errorLine2="                         ~~~~~">
@@ -5429,7 +5429,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.hasOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasOnClick()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -5438,7 +5438,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ActionBuilders.actionFromProto(mImpl.getOnClick());"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -5447,7 +5447,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.Clickable.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -5456,7 +5456,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setId(id);"
         errorLine2="                      ~~~~~">
@@ -5465,7 +5465,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setOnClick(onClick.toActionProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -5474,7 +5474,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.hasContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasContentDescription()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -5483,7 +5483,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getContentDescription());"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~~~">
@@ -5492,7 +5492,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getRole can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getRole().getNumber();"
         errorLine2="                         ~~~~~~~">
@@ -5501,7 +5501,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getRole().getNumber();"
         errorLine2="                                   ~~~~~~~~~">
@@ -5510,7 +5510,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.hasStateDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasStateDescription()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -5519,7 +5519,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getStateDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return StringProp.fromProto(mImpl.getStateDescription());"
         errorLine2="                                                  ~~~~~~~~~~~~~~~~~~~">
@@ -5528,7 +5528,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.Semantics.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -5537,7 +5537,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRole can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRole(ModifiersProto.SemanticsRole.forNumber(role));"
         errorLine2="                      ~~~~~~~">
@@ -5546,7 +5546,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SemanticsRole.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRole(ModifiersProto.SemanticsRole.forNumber(role));"
         errorLine2="                                                           ~~~~~~~~~">
@@ -5555,7 +5555,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStateDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setStateDescription(stateDescription.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -5564,7 +5564,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setObsoleteContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setObsoleteContentDescription(contentDescription.getValue());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5573,7 +5573,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setContentDescription(contentDescription.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -5582,7 +5582,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasEnd()) {"
         errorLine2="                      ~~~~~~">
@@ -5591,7 +5591,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getEnd());"
         errorLine2="                                              ~~~~~~">
@@ -5600,7 +5600,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasStart()) {"
         errorLine2="                      ~~~~~~~~">
@@ -5609,7 +5609,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getStart());"
         errorLine2="                                              ~~~~~~~~">
@@ -5618,7 +5618,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasTop()) {"
         errorLine2="                      ~~~~~~">
@@ -5627,7 +5627,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getTop());"
         errorLine2="                                              ~~~~~~">
@@ -5636,7 +5636,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasBottom()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5645,7 +5645,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getBottom());"
         errorLine2="                                              ~~~~~~~~~">
@@ -5654,7 +5654,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRtlAware()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5663,7 +5663,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return BoolProp.fromProto(mImpl.getRtlAware());"
         errorLine2="                                                ~~~~~~~~~~~">
@@ -5672,7 +5672,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.Padding.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -5681,7 +5681,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setEnd(end.toProto());"
         errorLine2="                      ~~~~~~">
@@ -5690,7 +5690,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setStart(start.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5699,7 +5699,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTop(top.toProto());"
         errorLine2="                      ~~~~~~">
@@ -5708,7 +5708,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setBottom(bottom.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -5717,7 +5717,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRtlAware(rtlAware.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5726,7 +5726,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -5735,7 +5735,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getWidth());"
         errorLine2="                                              ~~~~~~~~">
@@ -5744,7 +5744,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -5753,7 +5753,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                 ~~~~~~~~">
@@ -5762,7 +5762,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final ModifiersProto.Border.Builder mImpl = ModifiersProto.Border.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -5771,7 +5771,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidth(width.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5780,7 +5780,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5789,7 +5789,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.hasRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasRadius()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5798,7 +5798,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.getRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DpProp.fromProto(mImpl.getRadius());"
         errorLine2="                                              ~~~~~~~~~">
@@ -5807,7 +5807,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final ModifiersProto.Corner.Builder mImpl = ModifiersProto.Corner.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -5816,7 +5816,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setRadius(radius.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -5825,7 +5825,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -5834,7 +5834,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                 ~~~~~~~~">
@@ -5843,7 +5843,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasCorner()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5852,7 +5852,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Corner.fromProto(mImpl.getCorner());"
         errorLine2="                                              ~~~~~~~~~">
@@ -5861,7 +5861,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.Background.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -5870,7 +5870,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5879,7 +5879,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setCorner(corner.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -5888,7 +5888,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ElementMetadata.getTagData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getTagData().toByteArray();"
         errorLine2="                         ~~~~~~~~~~">
@@ -5897,7 +5897,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ElementMetadata.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.ElementMetadata.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -5906,7 +5906,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTagData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTagData(ByteString.copyFrom(tagData));"
         errorLine2="                      ~~~~~~~~~~">
@@ -5915,7 +5915,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5924,7 +5924,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -5933,7 +5933,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5942,7 +5942,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Semantics.fromProto(mImpl.getSemantics());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -5951,7 +5951,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasPadding()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -5960,7 +5960,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Padding.fromProto(mImpl.getPadding());"
         errorLine2="                                               ~~~~~~~~~~">
@@ -5969,7 +5969,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasBorder()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5978,7 +5978,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Border.fromProto(mImpl.getBorder());"
         errorLine2="                                              ~~~~~~~~~">
@@ -5987,7 +5987,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasBackground()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -5996,7 +5996,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Background.fromProto(mImpl.getBackground());"
         errorLine2="                                                  ~~~~~~~~~~~~~">
@@ -6005,7 +6005,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasMetadata()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6014,7 +6014,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ElementMetadata.fromProto(mImpl.getMetadata());"
         errorLine2="                                                       ~~~~~~~~~~~">
@@ -6023,7 +6023,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasContentUpdateAnimation can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasContentUpdateAnimation()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6032,7 +6032,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getContentUpdateAnimation can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AnimatedVisibility.fromProto(mImpl.getContentUpdateAnimation());"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6041,7 +6041,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.Modifiers.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -6050,7 +6050,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6059,7 +6059,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSemantics(semantics.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6068,7 +6068,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setPadding(padding.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -6077,7 +6077,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setBorder(border.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -6086,7 +6086,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setBackground(background.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6095,7 +6095,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setMetadata(metadata.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6104,7 +6104,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContentUpdateAnimation can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setContentUpdateAnimation(contentUpdateAnimation.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6113,7 +6113,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.hasEnterTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasEnterTransition()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -6122,7 +6122,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.getEnterTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return EnterTransition.fromProto(mImpl.getEnterTransition());"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
@@ -6131,7 +6131,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.hasExitTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasExitTransition()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -6140,7 +6140,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.getExitTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ExitTransition.fromProto(mImpl.getExitTransition());"
         errorLine2="                                                      ~~~~~~~~~~~~~~~~~">
@@ -6149,7 +6149,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedVisibility.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.AnimatedVisibility.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -6158,7 +6158,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEnterTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setEnterTransition(enterTransition.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -6167,7 +6167,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExitTransition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setExitTransition(exitTransition.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -6176,7 +6176,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.hasFadeIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasFadeIn()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -6185,7 +6185,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.getFadeIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FadeInTransition.fromProto(mImpl.getFadeIn());"
         errorLine2="                                                        ~~~~~~~~~">
@@ -6194,7 +6194,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.hasSlideIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasSlideIn()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -6203,7 +6203,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.getSlideIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SlideInTransition.fromProto(mImpl.getSlideIn());"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -6212,7 +6212,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EnterTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.EnterTransition.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -6221,7 +6221,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFadeIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFadeIn(fadeIn.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -6230,7 +6230,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSlideIn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSlideIn(slideIn.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -6239,7 +6239,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.getInitialAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getInitialAlpha();"
         errorLine2="                         ~~~~~~~~~~~~~~~">
@@ -6248,7 +6248,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.hasAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnimationSpec()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6257,7 +6257,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AnimationSpec.fromProto(mImpl.getAnimationSpec());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -6266,7 +6266,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeInTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.FadeInTransition.newBuilder();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -6275,7 +6275,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInitialAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setInitialAlpha(initialAlpha);"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -6284,7 +6284,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimationSpec(animationSpec.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6293,7 +6293,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDirection().getNumber();"
         errorLine2="                                        ~~~~~~~~~">
@@ -6302,7 +6302,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getDirection can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDirection().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -6311,7 +6311,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.hasInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasInitialSlideBound()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -6320,7 +6320,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ModifiersBuilders.slideBoundFromProto(mImpl.getInitialSlideBound());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~">
@@ -6329,7 +6329,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.hasAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnimationSpec()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6338,7 +6338,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AnimationSpec.fromProto(mImpl.getAnimationSpec());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -6347,7 +6347,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideInTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.SlideInTransition.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -6356,7 +6356,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDirection can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDirection(ModifiersProto.SlideDirection.forNumber(direction));"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6365,7 +6365,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDirection(ModifiersProto.SlideDirection.forNumber(direction));"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -6374,7 +6374,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInitialSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setInitialSlideBound(initialSlideBound.toSlideBoundProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -6383,7 +6383,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimationSpec(animationSpec.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6392,7 +6392,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.hasFadeOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasFadeOut()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -6401,7 +6401,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.getFadeOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return FadeOutTransition.fromProto(mImpl.getFadeOut());"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -6410,7 +6410,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.hasSlideOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasSlideOut()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6419,7 +6419,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.getSlideOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return SlideOutTransition.fromProto(mImpl.getSlideOut());"
         errorLine2="                                                          ~~~~~~~~~~~">
@@ -6428,7 +6428,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExitTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.ExitTransition.newBuilder();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -6437,7 +6437,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFadeOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFadeOut(fadeOut.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -6446,7 +6446,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSlideOut can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSlideOut(slideOut.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6455,7 +6455,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.getTargetAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getTargetAlpha();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -6464,7 +6464,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.hasAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnimationSpec()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6473,7 +6473,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AnimationSpec.fromProto(mImpl.getAnimationSpec());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -6482,7 +6482,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FadeOutTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.FadeOutTransition.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -6491,7 +6491,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTargetAlpha can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTargetAlpha(targetAlpha);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -6500,7 +6500,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimationSpec(animationSpec.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6509,7 +6509,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDirection().getNumber();"
         errorLine2="                                        ~~~~~~~~~">
@@ -6518,7 +6518,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getDirection can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getDirection().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -6527,7 +6527,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.hasTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasTargetSlideBound()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -6536,7 +6536,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return ModifiersBuilders.slideBoundFromProto(mImpl.getTargetSlideBound());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -6545,7 +6545,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.hasAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAnimationSpec()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6554,7 +6554,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.getAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AnimationSpec.fromProto(mImpl.getAnimationSpec());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -6563,7 +6563,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideOutTransition.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.SlideOutTransition.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -6572,7 +6572,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDirection can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDirection(ModifiersProto.SlideDirection.forNumber(direction));"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6581,7 +6581,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideDirection.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDirection(ModifiersProto.SlideDirection.forNumber(direction));"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -6590,7 +6590,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTargetSlideBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTargetSlideBound(targetSlideBound.toSlideBoundProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -6599,7 +6599,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimationSpec can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimationSpec(animationSpec.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6608,7 +6608,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.hasParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasParentBound()) {"
         errorLine2="                  ~~~~~~~~~~~~~~">
@@ -6617,7 +6617,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.getParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return SlideParentBound.fromProto(proto.getParentBound(), fingerprint);"
         errorLine2="                                                    ~~~~~~~~~~~~~~">
@@ -6626,7 +6626,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.getSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getSnapTo().getNumber();"
         errorLine2="                         ~~~~~~~~~">
@@ -6635,7 +6635,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getSnapTo().getNumber();"
         errorLine2="                                     ~~~~~~~~~">
@@ -6644,7 +6644,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setParentBound can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ModifiersProto.SlideBound.newBuilder().setParentBound(mImpl).build();"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -6653,7 +6653,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideBound.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return ModifiersProto.SlideBound.newBuilder().setParentBound(mImpl).build();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -6662,7 +6662,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentBound.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.SlideParentBound.newBuilder();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -6671,7 +6671,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSnapTo can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSnapTo(ModifiersProto.SlideParentSnapOption.forNumber(snapTo));"
         errorLine2="                      ~~~~~~~~~">
@@ -6680,7 +6680,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SlideParentSnapOption.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSnapTo(ModifiersProto.SlideParentSnapOption.forNumber(snapTo));"
         errorLine2="                                                                     ~~~~~~~~~">
@@ -6689,7 +6689,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6698,7 +6698,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -6707,7 +6707,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6716,7 +6716,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Semantics.fromProto(mImpl.getSemantics());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -6725,7 +6725,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.ArcModifiers.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -6734,7 +6734,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6743,7 +6743,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setSemantics(semantics.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6752,7 +6752,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6761,7 +6761,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -6770,7 +6770,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ModifiersProto.SpanModifiers.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -6779,7 +6779,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6788,7 +6788,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getResourceId();"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -6797,7 +6797,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByResId.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.AndroidImageResourceByResId.newBuilder();"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -6806,7 +6806,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setResourceId(resourceId);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6815,7 +6815,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getData().toByteArray();"
         errorLine2="                         ~~~~~~~">
@@ -6824,7 +6824,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getWidthPx();"
         errorLine2="                         ~~~~~~~~~~">
@@ -6833,7 +6833,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getHeightPx();"
         errorLine2="                         ~~~~~~~~~~~">
@@ -6842,7 +6842,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getFormat().getNumber();"
         errorLine2="                                     ~~~~~~~~~">
@@ -6851,7 +6851,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getFormat().getNumber();"
         errorLine2="                         ~~~~~~~~~">
@@ -6860,7 +6860,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.InlineImageResource.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -6869,7 +6869,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setData(ByteString.copyFrom(data));"
         errorLine2="                      ~~~~~~~">
@@ -6878,7 +6878,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setWidthPx(widthPx);"
         errorLine2="                      ~~~~~~~~~~">
@@ -6887,7 +6887,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setHeightPx(heightPx);"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6896,7 +6896,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFormat(ResourceProto.ImageFormat.forNumber(format));"
         errorLine2="                      ~~~~~~~~~">
@@ -6905,7 +6905,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setFormat(ResourceProto.ImageFormat.forNumber(format));"
         errorLine2="                                                          ~~~~~~~~~">
@@ -6914,7 +6914,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAnimatedImageFormat().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6923,7 +6923,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAnimatedImageFormat().getNumber();"
         errorLine2="                                                  ~~~~~~~~~">
@@ -6932,7 +6932,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getResourceId();"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -6941,7 +6941,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.hasStartTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasStartTrigger()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -6950,7 +6950,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.getStartTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return TriggerBuilders.triggerFromProto(mImpl.getStartTrigger());"
         errorLine2="                                                              ~~~~~~~~~~~~~~~">
@@ -6959,7 +6959,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidAnimatedImageResourceByResId.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.AndroidAnimatedImageResourceByResId.newBuilder();"
         errorLine2="                                                                      ~~~~~~~~~~">
@@ -6968,7 +6968,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimatedImageFormat("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6977,7 +6977,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        ResourceProto.AnimatedImageFormat.forNumber(animatedImageFormat));"
         errorLine2="                                                          ~~~~~~~~~">
@@ -6986,7 +6986,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setResourceId(resourceId);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6995,7 +6995,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setStartTrigger(startTrigger.toTriggerProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -7004,7 +7004,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAnimatedImageFormat().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~">
@@ -7013,7 +7013,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getAnimatedImageFormat().getNumber();"
         errorLine2="                                                  ~~~~~~~~~">
@@ -7022,7 +7022,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getResourceId();"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -7031,7 +7031,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.hasProgress can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasProgress()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -7040,7 +7040,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.getProgress can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicFloatFromProto(mImpl.getProgress());"
         errorLine2="                                                                   ~~~~~~~~~~~">
@@ -7049,7 +7049,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidSeekableAnimatedImageResourceByResId.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.AndroidSeekableAnimatedImageResourceByResId.newBuilder();"
         errorLine2="                                                                              ~~~~~~~~~~">
@@ -7058,7 +7058,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimatedImageFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAnimatedImageFormat("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -7067,7 +7067,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AnimatedImageFormat.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        ResourceProto.AnimatedImageFormat.forNumber(animatedImageFormat));"
         errorLine2="                                                          ~~~~~~~~~">
@@ -7076,7 +7076,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setResourceId(resourceId);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -7085,7 +7085,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setProgress can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setProgress(progress.toDynamicFloatProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -7094,7 +7094,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidResourceByResId()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7103,7 +7103,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return AndroidImageResourceByResId.fromProto(mImpl.getAndroidResourceByResId());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7112,7 +7112,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasInlineResource()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -7121,7 +7121,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return InlineImageResource.fromProto(mImpl.getInlineResource());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~">
@@ -7130,7 +7130,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidAnimatedResourceByResId()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7139,7 +7139,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        mImpl.getAndroidAnimatedResourceByResId());"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7148,7 +7148,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasAndroidSeekableAnimatedResourceByResId()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7157,7 +7157,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                        mImpl.getAndroidSeekableAnimatedResourceByResId());"
         errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7166,7 +7166,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.ImageResource.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -7175,7 +7175,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidResourceByResId(androidResourceByResId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7184,7 +7184,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setInlineResource(inlineResource.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -7193,7 +7193,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidAnimatedResourceByResId(androidAnimatedResourceByResId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7202,7 +7202,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidSeekableAnimatedResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setAndroidSeekableAnimatedResourceByResId("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7211,7 +7211,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getVersion();"
         errorLine2="                         ~~~~~~~~~~">
@@ -7220,7 +7220,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    mImpl.getIdToImageMap().entrySet()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7229,7 +7229,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    ResourceProto.Resources.newBuilder();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -7238,7 +7238,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setVersion(version);"
         errorLine2="                      ~~~~~~~~~~">
@@ -7247,7 +7247,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putIdToImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.putIdToImage(id, image.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7256,7 +7256,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.getLastClickableId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getLastClickableId();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
@@ -7265,7 +7265,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.getIdToValueMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    mImpl.getIdToValueMap().entrySet()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7274,7 +7274,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final StateProto.State.Builder mImpl = StateProto.State.newBuilder();"
         errorLine2="                                                                            ~~~~~~~~~~">
@@ -7283,7 +7283,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getIdToValueMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.getIdToValueMap().size() >= getMaxStateEntryCount()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7292,7 +7292,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putIdToValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.putIdToValue(sourceKey.getKey(), value.toDynamicDataValueProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7301,7 +7301,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getIdToValueMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.getIdToValueMap().size() > getMaxStateEntryCount()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7310,7 +7310,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.getIdToValueMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                                    mImpl.getIdToValueMap().size(), getMaxStateEntryCount()));"
         errorLine2="                                          ~~~~~~~~~~~~~~~">
@@ -7319,7 +7319,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getStartMillis();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -7328,7 +7328,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getEndMillis();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -7337,7 +7337,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    TimelineProto.TimeInterval.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -7346,7 +7346,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setStartMillis(startMillis);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -7355,7 +7355,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setEndMillis(endMillis);"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7364,7 +7364,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasValidity()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -7373,7 +7373,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return TimeInterval.fromProto(mImpl.getValidity());"
         errorLine2="                                                    ~~~~~~~~~~~">
@@ -7382,7 +7382,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasLayout()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -7391,7 +7391,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return Layout.fromProto(mImpl.getLayout());"
         errorLine2="                                              ~~~~~~~~~">
@@ -7400,7 +7400,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    TimelineProto.TimelineEntry.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -7409,7 +7409,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValidity(validity.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -7418,7 +7418,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setLayout(layout.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -7427,7 +7427,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.getTimelineEntriesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            for (TimelineProto.TimelineEntry item : mImpl.getTimelineEntriesList()) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
@@ -7436,7 +7436,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    TimelineProto.Timeline.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -7445,7 +7445,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addTimelineEntries can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.addTimelineEntries(timelineEntry.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -7454,7 +7454,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOnLoadTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return TriggerProto.Trigger.newBuilder().setOnLoadTrigger(mImpl).build();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~">
@@ -7463,7 +7463,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return TriggerProto.Trigger.newBuilder().setOnLoadTrigger(mImpl).build();"
         errorLine2="                                        ~~~~~~~~~~">
@@ -7472,7 +7472,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnLoadTrigger.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    TriggerProto.OnLoadTrigger.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -7481,7 +7481,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnConditionMetTrigger.hasCondition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasCondition()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7490,7 +7490,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnConditionMetTrigger.getCondition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicBoolFromProto(mImpl.getCondition());"
         errorLine2="                                                                  ~~~~~~~~~~~~">
@@ -7499,7 +7499,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOnConditionMetTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return TriggerProto.Trigger.newBuilder().setOnConditionMetTrigger(mImpl).build();"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7508,7 +7508,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return TriggerProto.Trigger.newBuilder().setOnConditionMetTrigger(mImpl).build();"
         errorLine2="                                        ~~~~~~~~~~">
@@ -7517,7 +7517,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="OnConditionMetTrigger.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                    TriggerProto.OnConditionMetTrigger.newBuilder();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -7526,7 +7526,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCondition can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setCondition(dynamicBool.toDynamicBoolProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7535,7 +7535,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.hasOnLoadTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasOnLoadTrigger()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~">
@@ -7544,7 +7544,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getOnLoadTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return OnLoadTrigger.fromProto(proto.getOnLoadTrigger(), fingerprint);"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~">
@@ -7553,7 +7553,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.hasOnConditionMetTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="        if (proto.hasOnConditionMetTrigger()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7562,7 +7562,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Trigger.getOnConditionMetTrigger can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return OnConditionMetTrigger.fromProto(proto.getOnConditionMetTrigger(), fingerprint);"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7571,7 +7571,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValueForLayout();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -7580,7 +7580,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getTextAlignmentForLayoutValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getTextAlignmentForLayoutValue();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7589,7 +7589,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final TypesProto.StringProp.Builder mImpl = TypesProto.StringProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -7598,7 +7598,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValueForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValueForLayout(patternForLayout);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -7607,7 +7607,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTextAlignmentForLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTextAlignmentForLayout(AlignmentProto.TextAlignment.forNumber(alignment));"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7616,7 +7616,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setTextAlignmentForLayout(AlignmentProto.TextAlignment.forNumber(alignment));"
         errorLine2="                                                                             ~~~~~~~~~">
@@ -7625,7 +7625,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -7634,7 +7634,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final TypesProto.Int32Prop.Builder mImpl = TypesProto.Int32Prop.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -7643,7 +7643,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -7652,7 +7652,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -7661,7 +7661,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasDynamicValue()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -7670,7 +7670,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicStringFromProto(mImpl.getDynamicValue());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~">
@@ -7679,7 +7679,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final TypesProto.StringProp.Builder mImpl = TypesProto.StringProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -7688,7 +7688,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -7697,7 +7697,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDynamicValue(dynamicValue.toDynamicStringProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -7706,7 +7706,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7715,7 +7715,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                                                      ~~~~~~~~">
@@ -7724,7 +7724,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -7733,7 +7733,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            if (mImpl.hasDynamicValue()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -7742,7 +7742,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                return DynamicBuilders.dynamicFloatFromProto(mImpl.getDynamicValue());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~">
@@ -7751,7 +7751,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final TypesProto.FloatProp.Builder mImpl = TypesProto.FloatProp.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -7760,7 +7760,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -7769,7 +7769,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setDynamicValue(dynamicValue.toDynamicFloatProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -7778,7 +7778,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasDynamicValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -7787,7 +7787,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.hasValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                if (mImpl.hasDynamicValue() &amp;&amp; !mImpl.hasValue()) {"
         errorLine2="                                                      ~~~~~~~~">
@@ -7796,7 +7796,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -7805,7 +7805,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="            private final TypesProto.BoolProp.Builder mImpl = TypesProto.BoolProp.newBuilder();"
         errorLine2="                                                                                  ~~~~~~~~~~">
@@ -7814,7 +7814,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.protolayout`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
diff --git a/wear/tiles/tiles-material/lint-baseline.xml b/wear/tiles/tiles-material/lint-baseline.xml
index c4c5193..9c080eb 100644
--- a/wear/tiles/tiles-material/lint-baseline.xml
+++ b/wear/tiles/tiles-material/lint-baseline.xml
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Modifiers.newBuilder(modifiers.toProto())"
         errorLine2="                                             ~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                            .setMetadata("
         errorLine2="                             ~~~~~~~~~~~">
diff --git a/wear/tiles/tiles-renderer/lint-baseline.xml b/wear/tiles/tiles-renderer/lint-baseline.xml
index f47a33a..7d85391 100644
--- a/wear/tiles/tiles-renderer/lint-baseline.xml
+++ b/wear/tiles/tiles-renderer/lint-baseline.xml
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    res.toProto()"
         errorLine2="                        ~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.parseFrom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        val resources = ResourceProto.Resources.parseFrom(resourcesData.contents)"
         errorLine2="                                                                ~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                            ResourceBuilders.Resources.fromProto(resources))"
         errorLine2="                                                       ~~~~~~~~~">
@@ -38,43 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="        val future = ResolvableFuture.create&lt;T>()"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                        future.set(fn(it))"
-        errorLine2="                               ~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                        future.set(fn(it))"
-        errorLine2="                                   ~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                future.setException(ex)"
-        errorLine2="                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/connection/DefaultTileClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        res -> ResourceBuilders.Resources.fromProto(res.toProto()),"
         errorLine2="                                                          ~~~~~~~~~">
@@ -83,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                StateBuilders.State.fromProto(nextState)));"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -92,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnimationEnabled can only be called from within the same library (androidx.wear.protolayout:protolayout-renderer)"
         errorLine1="                        .setAnimationEnabled(true)"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
@@ -101,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIsViewFullyVisible can only be called from within the same library (androidx.wear.protolayout:protolayout-renderer)"
         errorLine1="                        .setIsViewFullyVisible(true)"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~">
@@ -110,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setProtoLayoutTheme can only be called from within the same library (androidx.wear.protolayout:protolayout-renderer)"
         errorLine1="            config.setProtoLayoutTheme(new ProtoLayoutThemeImpl(uiContext, tilesTheme));"
         errorLine2="                   ~~~~~~~~~~~~~~~~~~~">
@@ -119,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        androidx.wear.tiles.StateBuilders.State.fromProto(nextState.toProto()));"
         errorLine2="                                                                                    ~~~~~~~">
@@ -128,61 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mLayout, errorMessage),"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mLayout, errorMessage),"
-        errorLine2="                                         ~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mLayout, errorMessage),"
-        errorLine2="                                                  ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mResources, errorMessage),"
-        errorLine2="                            ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mResources, errorMessage),"
-        errorLine2="                                         ~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                            checkNotNull(mResources, errorMessage),"
-        errorLine2="                                                     ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/renderer/TileRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return inflateLayout(layout.toProto(), resources.toProto(), parent);"
         errorLine2="                                    ~~~~~~~">
@@ -191,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return inflateLayout(layout.toProto(), resources.toProto(), parent);"
         errorLine2="                                                         ~~~~~~~">
@@ -200,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        mCache = new TilesTimelineCacheInternal(timeline.toProto());"
         errorLine2="                                                         ~~~~~~~">
@@ -209,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return TimelineBuilders.TimelineEntry.fromProto(entry);"
         errorLine2="                                              ~~~~~~~~~">
@@ -218,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return TimelineBuilders.TimelineEntry.fromProto(entry);"
         errorLine2="                                              ~~~~~~~~~">
@@ -227,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return mCache.findCurrentTimelineEntryExpiry(entry.toProto(), fromTimeMillis);"
         errorLine2="                                                           ~~~~~~~">
@@ -236,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.getTimelineEntriesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        for (TimelineEntry entry : mTimeline.getTimelineEntriesList()) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
@@ -245,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (!entry.hasValidity()) {"
         errorLine2="                       ~~~~~~~~~~~">
@@ -254,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                TimeInterval validity = entry.getValidity();"
         errorLine2="                                              ~~~~~~~~~~~">
@@ -263,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                long validityLength = validity.getEndMillis() - validity.getStartMillis();"
         errorLine2="                                               ~~~~~~~~~~~~">
@@ -272,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                long validityLength = validity.getEndMillis() - validity.getStartMillis();"
         errorLine2="                                                                         ~~~~~~~~~~~~~~">
@@ -281,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (validity.getStartMillis() &lt;= timeMillis"
         errorLine2="                             ~~~~~~~~~~~~~~">
@@ -290,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        &amp;&amp; timeMillis &lt; validity.getEndMillis()) {"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -299,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.getTimelineEntriesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        for (TimelineEntry entry : mTimeline.getTimelineEntriesList()) {"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~">
@@ -308,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (!entry.hasValidity()) {"
         errorLine2="                       ~~~~~~~~~~~">
@@ -317,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            TimeInterval validity = entry.getValidity();"
         errorLine2="                                          ~~~~~~~~~~~">
@@ -326,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (validity.getStartMillis() &lt;= timeMillis &amp;&amp; timeMillis &lt; validity.getEndMillis()) {"
         errorLine2="                                                                                 ~~~~~~~~~~~~">
@@ -335,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (validity.getStartMillis() &lt;= timeMillis &amp;&amp; timeMillis &lt; validity.getEndMillis()) {"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -344,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (validity.getStartMillis() > timeMillis) {"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -353,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                error = validity.getStartMillis() - timeMillis;"
         errorLine2="                                 ~~~~~~~~~~~~~~">
@@ -362,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                error = timeMillis - validity.getEndMillis();"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -371,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (entry.hasValidity() &amp;&amp; entry.getValidity().getEndMillis() > fromTimeMillis) {"
         errorLine2="                                                       ~~~~~~~~~~~~">
@@ -380,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (entry.hasValidity() &amp;&amp; entry.getValidity().getEndMillis() > fromTimeMillis) {"
         errorLine2="                                         ~~~~~~~~~~~">
@@ -389,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (entry.hasValidity() &amp;&amp; entry.getValidity().getEndMillis() > fromTimeMillis) {"
         errorLine2="                  ~~~~~~~~~~~">
@@ -398,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            currentSmallestExpiry = entry.getValidity().getEndMillis();"
         errorLine2="                                                        ~~~~~~~~~~~~">
@@ -407,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            currentSmallestExpiry = entry.getValidity().getEndMillis();"
         errorLine2="                                          ~~~~~~~~~~~">
@@ -416,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    entry.getValidity().getEndMillis() - entry.getValidity().getStartMillis();"
         errorLine2="                                        ~~~~~~~~~~~~">
@@ -425,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    entry.getValidity().getEndMillis() - entry.getValidity().getStartMillis();"
         errorLine2="                                                                             ~~~~~~~~~~~~~~">
@@ -434,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    entry.getValidity().getEndMillis() - entry.getValidity().getStartMillis();"
         errorLine2="                          ~~~~~~~~~~~">
@@ -443,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    entry.getValidity().getEndMillis() - entry.getValidity().getStartMillis();"
         errorLine2="                                                               ~~~~~~~~~~~">
@@ -452,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.getTimelineEntriesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        for (TimelineEntry nextEntry : mTimeline.getTimelineEntriesList()) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~">
@@ -461,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (!nextEntry.hasValidity()) {"
         errorLine2="                           ~~~~~~~~~~~">
@@ -470,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            TimeInterval nextEntryValidity = nextEntry.getValidity();"
         errorLine2="                                                       ~~~~~~~~~~~">
@@ -479,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (entry.hasValidity()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -488,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (nextEntryValidity.getStartMillis() > entry.getValidity().getEndMillis()"
         errorLine2="                                                                             ~~~~~~~~~~~~">
@@ -497,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (nextEntryValidity.getStartMillis() > entry.getValidity().getEndMillis()"
         errorLine2="                                      ~~~~~~~~~~~~~~">
@@ -506,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (nextEntryValidity.getStartMillis() > entry.getValidity().getEndMillis()"
         errorLine2="                                                               ~~~~~~~~~~~">
@@ -515,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        || nextEntryValidity.getStartMillis()"
         errorLine2="                                             ~~~~~~~~~~~~~~">
@@ -524,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                &lt; entry.getValidity().getStartMillis()) {"
         errorLine2="                                                      ~~~~~~~~~~~~~~">
@@ -533,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                &lt; entry.getValidity().getStartMillis()) {"
         errorLine2="                                        ~~~~~~~~~~~">
@@ -542,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (nextEntryValidity.getStartMillis() > currentSmallestExpiry) {"
         errorLine2="                                  ~~~~~~~~~~~~~~">
@@ -551,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (nextEntryValidity.getStartMillis() &lt; fromTimeMillis) {"
         errorLine2="                                  ~~~~~~~~~~~~~~">
@@ -560,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    nextEntryValidity.getEndMillis() - nextEntryValidity.getStartMillis();"
         errorLine2="                                      ~~~~~~~~~~~~">
@@ -569,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    nextEntryValidity.getEndMillis() - nextEntryValidity.getStartMillis();"
         errorLine2="                                                                         ~~~~~~~~~~~~~~">
@@ -578,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                currentSmallestExpiry = nextEntryValidity.getStartMillis();"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -587,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return timeInterval.getEndMillis() > timeInterval.getStartMillis();"
         errorLine2="                            ~~~~~~~~~~~~">
@@ -596,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        return timeInterval.getEndMillis() > timeInterval.getStartMillis();"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -605,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                entry.getLayout())));"
         errorLine2="                                                      ~~~~~~~~~">
@@ -614,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        timeline.toProto(),"
         errorLine2="                                 ~~~~~~~">
@@ -623,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        LayoutElementBuilders.Layout.fromProto(entry.getLayout())));"
         errorLine2="                                                                     ~~~~~~~~~">
@@ -632,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        LayoutElementBuilders.Layout.fromProto(entry.getLayout())));"
         errorLine2="                                                                                     ~~~~~~~~~">
diff --git a/wear/tiles/tiles/lint-baseline.xml b/wear/tiles/tiles/lint-baseline.xml
index 52ebdb2..6222af8 100644
--- a/wear/tiles/tiles/lint-baseline.xml
+++ b/wear/tiles/tiles/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="RequireUnstableAidlAnnotation"
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidStringExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setStringVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setStringVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -146,7 +146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidStringExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidStringExtra.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -155,7 +155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1281351679);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -164,7 +164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -173,7 +173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -182,7 +182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidIntExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -191,7 +191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setIntVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -200,7 +200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setIntVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~">
@@ -209,7 +209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidIntExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidIntExtra.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -218,7 +218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1929293734);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -227,7 +227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -236,7 +236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -245,7 +245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidLongExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -254,7 +254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setLongVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -263,7 +263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setLongVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -272,7 +272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidLongExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidLongExtra.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -281,7 +281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-874743180);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -290,7 +290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -299,7 +299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Long.hashCode(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -308,7 +308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidDoubleExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -317,7 +317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setDoubleVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -326,7 +326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setDoubleVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~">
@@ -335,7 +335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidDoubleExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidDoubleExtra.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -344,7 +344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-278689892);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -353,7 +353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -362,7 +362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Double.hashCode(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -371,7 +371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidBooleanExtra.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -380,7 +380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setBooleanVal(mImpl).build();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -389,7 +389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.AndroidExtra.newBuilder().setBooleanVal(mImpl).build();"
         errorLine2="                                                         ~~~~~~~~~~~~~">
@@ -398,7 +398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidBooleanExtra.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidBooleanExtra.newBuilder();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -407,7 +407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1238672683);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -416,7 +416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -425,7 +425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Boolean.hashCode(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -434,7 +434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasStringVal()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -443,7 +443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getStringVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return AndroidStringExtra.fromProto(proto.getStringVal());"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -452,7 +452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasIntVal()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -461,7 +461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getIntVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return AndroidIntExtra.fromProto(proto.getIntVal());"
         errorLine2="                                                   ~~~~~~~~~">
@@ -470,7 +470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLongVal()) {"
         errorLine2="                  ~~~~~~~~~~">
@@ -479,7 +479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getLongVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return AndroidLongExtra.fromProto(proto.getLongVal());"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -488,7 +488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasDoubleVal()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -497,7 +497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getDoubleVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return AndroidDoubleExtra.fromProto(proto.getDoubleVal());"
         errorLine2="                                                      ~~~~~~~~~~~~">
@@ -506,7 +506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.hasBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasBooleanVal()) {"
         errorLine2="                  ~~~~~~~~~~~~~">
@@ -515,7 +515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidExtra.getBooleanVal can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return AndroidBooleanExtra.fromProto(proto.getBooleanVal());"
         errorLine2="                                                       ~~~~~~~~~~~~~">
@@ -524,7 +524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getPackageName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getPackageName();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -533,7 +533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getClassName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getClassName();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -542,7 +542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.getKeyToExtraMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getKeyToExtraMap().entrySet().stream()"
         errorLine2="                          ~~~~~~~~~~~~~~~~">
@@ -551,7 +551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidActivity.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.AndroidActivity.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -560,7 +560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1939606345);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -569,7 +569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPackageName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setPackageName(packageName);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -578,7 +578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, packageName.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -587,7 +587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClassName can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setClassName(className);"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -596,7 +596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, className.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -605,7 +605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putKeyToExtra can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.putKeyToExtra(key, extra.toAndroidExtraProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -614,7 +614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -623,7 +623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        key.hashCode(), checkNotNull(extra.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
@@ -632,7 +632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        key.hashCode(), checkNotNull(extra.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~">
@@ -641,7 +641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        key.hashCode(), checkNotNull(extra.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~">
@@ -650,7 +650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.hasAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasAndroidActivity()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -659,7 +659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.getAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return AndroidActivity.fromProto(mImpl.getAndroidActivity());"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~">
@@ -668,7 +668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLaunchAction(mImpl).build();"
         errorLine2="                                      ~~~~~~~~~~">
@@ -677,7 +677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLaunchAction(mImpl).build();"
         errorLine2="                                                   ~~~~~~~~~~~~~~~">
@@ -686,7 +686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LaunchAction.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.LaunchAction.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -695,7 +695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(175064445);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -704,7 +704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidActivity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAndroidActivity(androidActivity.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -713,7 +713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -722,7 +722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(androidActivity.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                          ~~~~~~~~~~~~~~~~~~~">
@@ -731,7 +731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(androidActivity.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -740,7 +740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(androidActivity.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -749,7 +749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.hasRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasRequestState()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -758,7 +758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.getRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return StateBuilders.State.fromProto(mImpl.getRequestState());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~">
@@ -767,7 +767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLoadAction(mImpl).build();"
         errorLine2="                                      ~~~~~~~~~~">
@@ -776,7 +776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ActionProto.Action.newBuilder().setLoadAction(mImpl).build();"
         errorLine2="                                                   ~~~~~~~~~~~~~">
@@ -785,7 +785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LoadAction.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ActionProto.LoadAction.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -794,7 +794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1728161517);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -803,7 +803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRequestState can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRequestState(requestState.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~">
@@ -812,7 +812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -821,7 +821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(requestState.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                       ~~~~~~~~~~~~~~~~~~~">
@@ -830,7 +830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(requestState.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -839,7 +839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(requestState.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -848,7 +848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.hasLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLaunchAction()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~">
@@ -857,7 +857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLaunchAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LaunchAction.fromProto(proto.getLaunchAction());"
         errorLine2="                                                ~~~~~~~~~~~~~~~">
@@ -866,7 +866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.hasLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLoadAction()) {"
         errorLine2="                  ~~~~~~~~~~~~~">
@@ -875,7 +875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Action.getLoadAction can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LoadAction.fromProto(proto.getLoadAction());"
         errorLine2="                                              ~~~~~~~~~~~~~">
@@ -884,7 +884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.getArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getArgb();"
         errorLine2="                         ~~~~~~~">
@@ -893,7 +893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final ColorProto.ColorProp.Builder mImpl = ColorProto.ColorProp.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -902,7 +902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1332287496);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -911,7 +911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setArgb can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setArgb(argb);"
         errorLine2="                      ~~~~~~~">
@@ -920,7 +920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, argb);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -929,7 +929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenWidthDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getScreenWidthDp();"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -938,7 +938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenHeightDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getScreenHeightDp();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -947,7 +947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenDensity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getScreenDensity();"
         errorLine2="                         ~~~~~~~~~~~~~~~~">
@@ -956,7 +956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getDevicePlatform can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getDevicePlatform().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~">
@@ -965,7 +965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DevicePlatform.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getDevicePlatform().getNumber();"
         errorLine2="                                             ~~~~~~~~~">
@@ -974,7 +974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getScreenShape can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getScreenShape().getNumber();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -983,7 +983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ScreenShape.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getScreenShape().getNumber();"
         errorLine2="                                          ~~~~~~~~~">
@@ -992,7 +992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    DeviceParametersProto.DeviceParameters.newBuilder();"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -1001,7 +1001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenWidthDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setScreenWidthDp(screenWidthDp);"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -1010,7 +1010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenHeightDp can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setScreenHeightDp(screenHeightDp);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -1019,7 +1019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenDensity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setScreenDensity(screenDensity);"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -1028,7 +1028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setDevicePlatform can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setDevicePlatform("
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -1037,7 +1037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DevicePlatform.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        DeviceParametersProto.DevicePlatform.forNumber(devicePlatform));"
         errorLine2="                                                             ~~~~~~~~~">
@@ -1046,7 +1046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setScreenShape can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setScreenShape(DeviceParametersProto.ScreenShape.forNumber(screenShape));"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -1055,7 +1055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ScreenShape.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setScreenShape(DeviceParametersProto.ScreenShape.forNumber(screenShape));"
         errorLine2="                                                                       ~~~~~~~~~">
@@ -1064,7 +1064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1073,7 +1073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~">
@@ -1082,7 +1082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1091,7 +1091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~">
@@ -1100,7 +1100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1109,7 +1109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -1118,7 +1118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.SpacerDimension.newBuilder().setLinearDimension(mImpl).build();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -1127,7 +1127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DpProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final DimensionProto.DpProp.Builder mImpl = DimensionProto.DpProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -1136,7 +1136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(752970309);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1145,7 +1145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1154,7 +1154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Float.floatToIntBits(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1163,7 +1163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1172,7 +1172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final DimensionProto.SpProp.Builder mImpl = DimensionProto.SpProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -1181,7 +1181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-2144685857);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1190,7 +1190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1199,7 +1199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, Float.floatToIntBits(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1208,7 +1208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1217,7 +1217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="EmProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final DimensionProto.EmProp.Builder mImpl = DimensionProto.EmProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -1226,7 +1226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1628313311);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1235,7 +1235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1244,7 +1244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Float.floatToIntBits(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1253,7 +1253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -1262,7 +1262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DegreesProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    DimensionProto.DegreesProp.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -1271,7 +1271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(405060347);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1280,7 +1280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -1289,7 +1289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Float.floatToIntBits(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1298,7 +1298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1307,7 +1307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    .setExpandedDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~">
@@ -1316,7 +1316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setExpandedDimension(mImpl).build();"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~">
@@ -1325,7 +1325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder().setExpandedDimension(mImpl).build();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1334,7 +1334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ExpandedDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    DimensionProto.ExpandedDimensionProp.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -1343,7 +1343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1053378170);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1352,7 +1352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ContainerDimension.newBuilder()"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -1361,7 +1361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    .setWrappedDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~">
@@ -1370,7 +1370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WrappedDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    DimensionProto.WrappedDimensionProp.newBuilder();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -1379,7 +1379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-113456542);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1388,7 +1388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getAspectRatioWidth();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~">
@@ -1397,7 +1397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.getAspectRatioHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getAspectRatioHeight();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1406,7 +1406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DimensionProto.ImageDimension.newBuilder()"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -1415,7 +1415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    .setProportionalDimension(mImpl)"
         errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1424,7 +1424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ProportionalDimensionProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    DimensionProto.ProportionalDimensionProp.newBuilder();"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -1433,7 +1433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-2079046835);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1442,7 +1442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAspectRatioWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAspectRatioWidth(aspectRatioWidth);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -1451,7 +1451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, aspectRatioWidth);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1460,7 +1460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAspectRatioHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAspectRatioHeight(aspectRatioHeight);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -1469,7 +1469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, aspectRatioHeight);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1478,7 +1478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1487,7 +1487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1496,7 +1496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasExpandedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
@@ -1505,7 +1505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ExpandedDimensionProp.fromProto(proto.getExpandedDimension());"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1514,7 +1514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.hasWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasWrappedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~">
@@ -1523,7 +1523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContainerDimension.getWrappedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return WrappedDimensionProp.fromProto(proto.getWrappedDimension());"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -1532,7 +1532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1541,7 +1541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1550,7 +1550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasExpandedDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~">
@@ -1559,7 +1559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getExpandedDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ExpandedDimensionProp.fromProto(proto.getExpandedDimension());"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~">
@@ -1568,7 +1568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.hasProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasProportionalDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1577,7 +1577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageDimension.getProportionalDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ProportionalDimensionProp.fromProto(proto.getProportionalDimension());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1586,7 +1586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.hasLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLinearDimension()) {"
         errorLine2="                  ~~~~~~~~~~~~~~~~~~">
@@ -1595,7 +1595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpacerDimension.getLinearDimension can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return DpProp.fromProto(proto.getLinearDimension());"
         errorLine2="                                          ~~~~~~~~~~~~~~~~~~">
@@ -1604,7 +1604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1613,7 +1613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1622,7 +1622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    AlignmentProto.HorizontalAlignmentProp.newBuilder();"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -1631,7 +1631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-384830516);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1640,7 +1640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.HorizontalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1649,7 +1649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.HorizontalAlignment.forNumber(value));"
         errorLine2="                                                                  ~~~~~~~~~">
@@ -1658,7 +1658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1667,7 +1667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1676,7 +1676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1685,7 +1685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    AlignmentProto.VerticalAlignmentProp.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -1694,7 +1694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1443510393);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1703,7 +1703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.VerticalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1712,7 +1712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.VerticalAlignment.forNumber(value));"
         errorLine2="                                                                ~~~~~~~~~">
@@ -1721,7 +1721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1730,7 +1730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1739,7 +1739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1748,7 +1748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.FontWeightProp.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -1757,7 +1757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1793388920);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1766,7 +1766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontWeight.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1775,7 +1775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontWeight.forNumber(value));"
         errorLine2="                                                             ~~~~~~~~~">
@@ -1784,7 +1784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1793,7 +1793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1802,7 +1802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1811,7 +1811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.FontVariantProp.newBuilder();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -1820,7 +1820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-293831500);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1829,7 +1829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontVariant.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1838,7 +1838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.FontVariant.forNumber(value));"
         errorLine2="                                                              ~~~~~~~~~">
@@ -1847,7 +1847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1856,7 +1856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -1865,7 +1865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -1874,7 +1874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.SpanVerticalAlignmentProp.newBuilder();"
         errorLine2="                                                                 ~~~~~~~~~~">
@@ -1883,7 +1883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1008812329);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -1892,7 +1892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.SpanVerticalAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -1901,7 +1901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.SpanVerticalAlignment.forNumber(value));"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -1910,7 +1910,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -1919,7 +1919,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasSize()) {"
         errorLine2="                      ~~~~~~~">
@@ -1928,7 +1928,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.SpProp.fromProto(mImpl.getSize());"
         errorLine2="                                                                ~~~~~~~">
@@ -1937,7 +1937,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasItalic()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -1946,7 +1946,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.BoolProp.fromProto(mImpl.getItalic());"
         errorLine2="                                                             ~~~~~~~~~">
@@ -1955,7 +1955,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasUnderline()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -1964,7 +1964,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.BoolProp.fromProto(mImpl.getUnderline());"
         errorLine2="                                                             ~~~~~~~~~~~~">
@@ -1973,7 +1973,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -1982,7 +1982,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorBuilders.ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                               ~~~~~~~~">
@@ -1991,7 +1991,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -2000,7 +2000,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return FontWeightProp.fromProto(mImpl.getWeight());"
         errorLine2="                                                      ~~~~~~~~~">
@@ -2009,7 +2009,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLetterSpacing()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -2018,7 +2018,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.EmProp.fromProto(mImpl.getLetterSpacing());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~">
@@ -2027,7 +2027,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.hasVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasVariant()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -2036,7 +2036,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.getVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return FontVariantProp.fromProto(mImpl.getVariant());"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -2045,7 +2045,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontStyle.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.FontStyle.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -2054,7 +2054,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(181264306);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2063,7 +2063,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSize can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setSize(size.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -2072,7 +2072,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2081,7 +2081,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(size.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -2090,7 +2090,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(size.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2099,7 +2099,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(size.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -2108,7 +2108,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setItalic(italic.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2117,7 +2117,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2126,7 +2126,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(italic.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -2135,7 +2135,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(italic.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2144,7 +2144,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(italic.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2153,7 +2153,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setItalic(TypesProto.BoolProp.newBuilder().setValue(italic));"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2162,7 +2162,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setItalic can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setItalic(TypesProto.BoolProp.newBuilder().setValue(italic));"
         errorLine2="                      ~~~~~~~~~">
@@ -2171,7 +2171,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setItalic(TypesProto.BoolProp.newBuilder().setValue(italic));"
         errorLine2="                                                                 ~~~~~~~~">
@@ -2180,7 +2180,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, Boolean.hashCode(italic));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2189,7 +2189,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setUnderline(underline.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2198,7 +2198,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2207,7 +2207,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(underline.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2216,7 +2216,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(underline.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2225,7 +2225,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(underline.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2234,7 +2234,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setUnderline(TypesProto.BoolProp.newBuilder().setValue(underline));"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -2243,7 +2243,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setUnderline can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setUnderline(TypesProto.BoolProp.newBuilder().setValue(underline));"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2252,7 +2252,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setUnderline(TypesProto.BoolProp.newBuilder().setValue(underline));"
         errorLine2="                                                                    ~~~~~~~~">
@@ -2261,7 +2261,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(3, Boolean.hashCode(underline));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2270,7 +2270,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -2279,7 +2279,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2288,7 +2288,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -2297,7 +2297,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2306,7 +2306,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -2315,7 +2315,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWeight(weight.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -2324,7 +2324,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2333,7 +2333,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(weight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -2342,7 +2342,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(weight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2351,7 +2351,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(weight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2360,7 +2360,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWeight("
         errorLine2="                      ~~~~~~~~~">
@@ -2369,7 +2369,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeightProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.FontWeightProp.newBuilder()"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -2378,7 +2378,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.FontWeight.forNumber(weight)));"
         errorLine2="                                 ~~~~~~~~">
@@ -2387,7 +2387,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontWeight.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.FontWeight.forNumber(weight)));"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -2396,7 +2396,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, weight);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2405,7 +2405,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLetterSpacing can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLetterSpacing(letterSpacing.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -2414,7 +2414,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2423,7 +2423,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(letterSpacing.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -2432,7 +2432,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(letterSpacing.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2441,7 +2441,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(letterSpacing.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2450,7 +2450,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVariant(variant.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -2459,7 +2459,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2468,7 +2468,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(variant.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~">
@@ -2477,7 +2477,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(variant.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2486,7 +2486,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(variant.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2495,7 +2495,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVariant can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVariant("
         errorLine2="                      ~~~~~~~~~~">
@@ -2504,7 +2504,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariantProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.FontVariantProp.newBuilder()"
         errorLine2="                                                           ~~~~~~~~~~">
@@ -2513,7 +2513,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.FontVariant.forNumber(variant)));"
         errorLine2="                                 ~~~~~~~~">
@@ -2522,7 +2522,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FontVariant.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.FontVariant.forNumber(variant)));"
         errorLine2="                                                                         ~~~~~~~~~">
@@ -2531,7 +2531,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(7, variant);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2540,7 +2540,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -2549,7 +2549,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -2558,7 +2558,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    AlignmentProto.TextAlignmentProp.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -2567,7 +2567,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(797507251);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2576,7 +2576,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.TextAlignment.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -2585,7 +2585,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.TextAlignment.forNumber(value));"
         errorLine2="                                                            ~~~~~~~~~">
@@ -2594,7 +2594,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2603,7 +2603,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -2612,7 +2612,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -2621,7 +2621,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.TextOverflowProp.newBuilder();"
         errorLine2="                                                        ~~~~~~~~~~">
@@ -2630,7 +2630,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1183432233);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2639,7 +2639,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.TextOverflow.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -2648,7 +2648,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.TextOverflow.forNumber(value));"
         errorLine2="                                                               ~~~~~~~~~">
@@ -2657,7 +2657,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2666,7 +2666,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -2675,7 +2675,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -2684,7 +2684,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    AlignmentProto.ArcAnchorTypeProp.newBuilder();"
         errorLine2="                                                     ~~~~~~~~~~">
@@ -2693,7 +2693,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1193249074);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2702,7 +2702,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.ArcAnchorType.forNumber(value));"
         errorLine2="                                                            ~~~~~~~~~">
@@ -2711,7 +2711,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(AlignmentProto.ArcAnchorType.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -2720,7 +2720,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2729,7 +2729,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -2738,7 +2738,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                               ~~~~~~~">
@@ -2747,7 +2747,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2756,7 +2756,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -2765,7 +2765,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2774,7 +2774,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -2783,7 +2783,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasMaxLines()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2792,7 +2792,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.Int32Prop.fromProto(mImpl.getMaxLines());"
         errorLine2="                                                              ~~~~~~~~~~~">
@@ -2801,7 +2801,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasMultilineAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -2810,7 +2810,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TextAlignmentProp.fromProto(mImpl.getMultilineAlignment());"
         errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~">
@@ -2819,7 +2819,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasOverflow()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -2828,7 +2828,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TextOverflowProp.fromProto(mImpl.getOverflow());"
         errorLine2="                                                        ~~~~~~~~~~~">
@@ -2837,7 +2837,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLineHeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -2846,7 +2846,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.SpProp.fromProto(mImpl.getLineHeight());"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -2855,7 +2855,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~">
@@ -2864,7 +2864,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -2873,7 +2873,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Text.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Text.newBuilder();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -2882,7 +2882,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1976530157);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -2891,7 +2891,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(text.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -2900,7 +2900,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2909,7 +2909,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -2918,7 +2918,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -2927,7 +2927,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -2936,7 +2936,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.mergeText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.mergeText(TypesProto.StringProp.newBuilder().setValue(text).build());"
         errorLine2="                      ~~~~~~~~~">
@@ -2945,7 +2945,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.mergeText(TypesProto.StringProp.newBuilder().setValue(text).build());"
         errorLine2="                                                                   ~~~~~~~~">
@@ -2954,7 +2954,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.mergeText(TypesProto.StringProp.newBuilder().setValue(text).build());"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -2963,7 +2963,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, text.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2972,7 +2972,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -2981,7 +2981,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -2990,7 +2990,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -2999,7 +2999,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3008,7 +3008,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3017,7 +3017,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3026,7 +3026,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3035,7 +3035,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -3044,7 +3044,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3053,7 +3053,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3062,7 +3062,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(maxLines.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3071,7 +3071,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3080,7 +3080,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -3089,7 +3089,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3098,7 +3098,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3107,7 +3107,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3116,7 +3116,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                                                                    ~~~~~~~~">
@@ -3125,7 +3125,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -3134,7 +3134,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, maxLines);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3143,7 +3143,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMultilineAlignment(multilineAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -3152,7 +3152,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3161,7 +3161,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
@@ -3170,7 +3170,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3179,7 +3179,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3188,7 +3188,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMultilineAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -3197,7 +3197,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.TextAlignmentProp.newBuilder()"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -3206,7 +3206,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -3215,7 +3215,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.TextAlignment.forNumber("
         errorLine2="                                                                     ~~~~~~~~~">
@@ -3224,7 +3224,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, multilineAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3233,7 +3233,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setOverflow(overflow.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -3242,7 +3242,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3251,7 +3251,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -3260,7 +3260,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3269,7 +3269,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3278,7 +3278,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setOverflow("
         errorLine2="                      ~~~~~~~~~~~">
@@ -3287,7 +3287,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.TextOverflowProp.newBuilder()"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -3296,7 +3296,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.TextOverflow.forNumber(overflow)));"
         errorLine2="                                 ~~~~~~~~">
@@ -3305,7 +3305,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.TextOverflow.forNumber(overflow)));"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -3314,7 +3314,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(6, overflow);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3323,7 +3323,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLineHeight(lineHeight.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3332,7 +3332,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3341,7 +3341,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -3350,7 +3350,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3359,7 +3359,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3368,7 +3368,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                                    ~~~~~~~~~">
@@ -3377,7 +3377,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue().getNumber();"
         errorLine2="                         ~~~~~~~~">
@@ -3386,7 +3386,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ContentScaleModeProp.newBuilder();"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -3395,7 +3395,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-893830536);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3404,7 +3404,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.ContentScaleMode.forNumber(value));"
         errorLine2="                      ~~~~~~~~">
@@ -3413,7 +3413,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(LayoutElementProto.ContentScaleMode.forNumber(value));"
         errorLine2="                                                                   ~~~~~~~~~">
@@ -3422,7 +3422,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3431,7 +3431,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.hasTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasTint()) {"
         errorLine2="                      ~~~~~~~">
@@ -3440,7 +3440,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.getTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorBuilders.ColorProp.fromProto(mImpl.getTint());"
         errorLine2="                                                               ~~~~~~~">
@@ -3449,7 +3449,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ColorFilter.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ColorFilter.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -3458,7 +3458,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(181311326);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3467,7 +3467,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setTint(tint.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -3476,7 +3476,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3485,7 +3485,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(tint.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -3494,7 +3494,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(tint.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3503,7 +3503,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(tint.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -3512,7 +3512,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasResourceId()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3521,7 +3521,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.StringProp.fromProto(mImpl.getResourceId());"
         errorLine2="                                                               ~~~~~~~~~~~~~">
@@ -3530,7 +3530,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -3539,7 +3539,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.imageDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                       ~~~~~~~~">
@@ -3548,7 +3548,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -3557,7 +3557,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.imageDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                       ~~~~~~~~~">
@@ -3566,7 +3566,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasContentScaleMode()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -3575,7 +3575,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ContentScaleModeProp.fromProto(mImpl.getContentScaleMode());"
         errorLine2="                                                            ~~~~~~~~~~~~~~~~~~~">
@@ -3584,7 +3584,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3593,7 +3593,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -3602,7 +3602,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.hasColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasColorFilter()) {"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -3611,7 +3611,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.getColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorFilter.fromProto(mImpl.getColorFilter());"
         errorLine2="                                                   ~~~~~~~~~~~~~~">
@@ -3620,7 +3620,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~">
@@ -3629,7 +3629,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -3638,7 +3638,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Image.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Image.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -3647,7 +3647,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-543078544);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3656,7 +3656,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(resourceId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3665,7 +3665,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3674,7 +3674,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -3683,7 +3683,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3692,7 +3692,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3701,7 +3701,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -3710,7 +3710,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                                                                       ~~~~~~~~">
@@ -3719,7 +3719,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -3728,7 +3728,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, resourceId.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3737,7 +3737,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toImageDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -3746,7 +3746,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3755,7 +3755,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -3764,7 +3764,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3773,7 +3773,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -3782,7 +3782,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toImageDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -3791,7 +3791,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3800,7 +3800,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -3809,7 +3809,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3818,7 +3818,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3827,7 +3827,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setContentScaleMode(contentScaleMode.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -3836,7 +3836,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3845,7 +3845,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(contentScaleMode.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
@@ -3854,7 +3854,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(contentScaleMode.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3863,7 +3863,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(contentScaleMode.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3872,7 +3872,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContentScaleMode can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setContentScaleMode("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~">
@@ -3881,7 +3881,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleModeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.ContentScaleModeProp.newBuilder()"
         errorLine2="                                                                ~~~~~~~~~~">
@@ -3890,7 +3890,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -3899,7 +3899,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ContentScaleMode.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        LayoutElementProto.ContentScaleMode.forNumber("
         errorLine2="                                                                            ~~~~~~~~~">
@@ -3908,7 +3908,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, contentScaleMode);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3917,7 +3917,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -3926,7 +3926,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3935,7 +3935,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -3944,7 +3944,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3953,7 +3953,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -3962,7 +3962,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColorFilter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setColorFilter(colorFilter.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -3971,7 +3971,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -3980,7 +3980,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(colorFilter.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~">
@@ -3989,7 +3989,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(colorFilter.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -3998,7 +3998,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(colorFilter.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4007,7 +4007,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -4016,7 +4016,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.spacerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                        ~~~~~~~~">
@@ -4025,7 +4025,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4034,7 +4034,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.spacerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                        ~~~~~~~~~">
@@ -4043,7 +4043,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4052,7 +4052,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -4061,7 +4061,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -4070,7 +4070,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -4079,7 +4079,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spacer.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Spacer.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -4088,7 +4088,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1748084575);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4097,7 +4097,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toSpacerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -4106,7 +4106,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4115,7 +4115,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -4124,7 +4124,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4133,7 +4133,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4142,7 +4142,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toSpacerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -4151,7 +4151,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4160,7 +4160,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -4169,7 +4169,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4178,7 +4178,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4187,7 +4187,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4196,7 +4196,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4205,7 +4205,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -4214,7 +4214,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4223,7 +4223,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4232,7 +4232,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getContentsList().stream()"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -4241,7 +4241,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -4250,7 +4250,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -4259,7 +4259,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -4268,7 +4268,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -4277,7 +4277,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHorizontalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4286,7 +4286,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getHorizontalAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4295,7 +4295,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasVerticalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -4304,7 +4304,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlignment());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4313,7 +4313,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4322,7 +4322,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -4331,7 +4331,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setBox(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -4340,7 +4340,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setBox(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -4349,7 +4349,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Box.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Box.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -4358,7 +4358,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1881256071);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4367,7 +4367,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -4376,7 +4376,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -4385,7 +4385,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -4394,7 +4394,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -4403,7 +4403,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4412,7 +4412,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -4421,7 +4421,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4430,7 +4430,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -4439,7 +4439,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4448,7 +4448,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4457,7 +4457,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -4466,7 +4466,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4475,7 +4475,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -4484,7 +4484,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4493,7 +4493,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4502,7 +4502,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHorizontalAlignment(horizontalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4511,7 +4511,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4520,7 +4520,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
@@ -4529,7 +4529,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -4538,7 +4538,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4547,7 +4547,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHorizontalAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -4556,7 +4556,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.HorizontalAlignmentProp.newBuilder()"
         errorLine2="                                                               ~~~~~~~~~~">
@@ -4565,7 +4565,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -4574,7 +4574,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.HorizontalAlignment.forNumber("
         errorLine2="                                                                           ~~~~~~~~~">
@@ -4583,7 +4583,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, horizontalAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4592,7 +4592,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlignment(verticalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -4601,7 +4601,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4610,7 +4610,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
@@ -4619,7 +4619,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4628,7 +4628,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4637,7 +4637,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -4646,7 +4646,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.VerticalAlignmentProp.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -4655,7 +4655,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -4664,7 +4664,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.VerticalAlignment.forNumber("
         errorLine2="                                                                         ~~~~~~~~~">
@@ -4673,7 +4673,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, verticalAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4682,7 +4682,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4691,7 +4691,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4700,7 +4700,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -4709,7 +4709,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4718,7 +4718,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4727,7 +4727,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -4736,7 +4736,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                               ~~~~~~~">
@@ -4745,7 +4745,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4754,7 +4754,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -4763,7 +4763,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4772,7 +4772,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.SpanModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                       ~~~~~~~~~~~~">
@@ -4781,7 +4781,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setText(mImpl).build();"
         errorLine2="                                                        ~~~~~~~">
@@ -4790,7 +4790,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setText(mImpl).build();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -4799,7 +4799,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanText.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.SpanText.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -4808,7 +4808,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-221774557);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4817,7 +4817,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(text.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -4826,7 +4826,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4835,7 +4835,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -4844,7 +4844,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4853,7 +4853,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -4862,7 +4862,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                      ~~~~~~~">
@@ -4871,7 +4871,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                                                                 ~~~~~~~~">
@@ -4880,7 +4880,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -4889,7 +4889,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, text.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4898,7 +4898,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4907,7 +4907,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4916,7 +4916,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -4925,7 +4925,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4934,7 +4934,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4943,7 +4943,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -4952,7 +4952,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -4961,7 +4961,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -4970,7 +4970,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -4979,7 +4979,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -4988,7 +4988,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasResourceId()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -4997,7 +4997,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.StringProp.fromProto(mImpl.getResourceId());"
         errorLine2="                                                               ~~~~~~~~~~~~~">
@@ -5006,7 +5006,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -5015,7 +5015,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getWidth());"
         errorLine2="                                                                ~~~~~~~~">
@@ -5024,7 +5024,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -5033,7 +5033,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getHeight());"
         errorLine2="                                                                ~~~~~~~~~">
@@ -5042,7 +5042,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5051,7 +5051,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.SpanModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                       ~~~~~~~~~~~~">
@@ -5060,7 +5060,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.hasAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5069,7 +5069,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.getAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return SpanVerticalAlignmentProp.fromProto(mImpl.getAlignment());"
         errorLine2="                                                                 ~~~~~~~~~~~~">
@@ -5078,7 +5078,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setImage(mImpl).build();"
         errorLine2="                                                        ~~~~~~~~">
@@ -5087,7 +5087,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.Span.newBuilder().setImage(mImpl).build();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -5096,7 +5096,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanImage.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.SpanImage.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -5105,7 +5105,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(502289772);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5114,7 +5114,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(resourceId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -5123,7 +5123,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5132,7 +5132,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -5141,7 +5141,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5150,7 +5150,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(resourceId.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5159,7 +5159,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -5168,7 +5168,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                                                                       ~~~~~~~~">
@@ -5177,7 +5177,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(TypesProto.StringProp.newBuilder().setValue(resourceId));"
         errorLine2="                                                          ~~~~~~~~~~">
@@ -5186,7 +5186,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, resourceId.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5195,7 +5195,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5204,7 +5204,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5213,7 +5213,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -5222,7 +5222,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5231,7 +5231,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -5240,7 +5240,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -5249,7 +5249,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5258,7 +5258,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -5267,7 +5267,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5276,7 +5276,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5285,7 +5285,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5294,7 +5294,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5303,7 +5303,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -5312,7 +5312,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5321,7 +5321,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5330,7 +5330,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAlignment(alignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5339,7 +5339,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5348,7 +5348,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(alignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -5357,7 +5357,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(alignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5366,7 +5366,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(alignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5375,7 +5375,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAlignment("
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5384,7 +5384,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.SpanVerticalAlignmentProp.newBuilder()"
         errorLine2="                                                                     ~~~~~~~~~~">
@@ -5393,7 +5393,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -5402,7 +5402,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanVerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        LayoutElementProto.SpanVerticalAlignment.forNumber("
         errorLine2="                                                                                 ~~~~~~~~~">
@@ -5411,7 +5411,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, alignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5420,7 +5420,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -5429,7 +5429,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return SpanText.fromProto(proto.getText());"
         errorLine2="                                            ~~~~~~~">
@@ -5438,7 +5438,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.hasImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasImage()) {"
         errorLine2="                  ~~~~~~~~">
@@ -5447,7 +5447,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Span.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return SpanImage.fromProto(proto.getImage());"
         errorLine2="                                             ~~~~~~~~">
@@ -5456,7 +5456,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getSpansList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getSpansList().stream()"
         errorLine2="                          ~~~~~~~~~~~~">
@@ -5465,7 +5465,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5474,7 +5474,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -5483,7 +5483,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasMaxLines()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5492,7 +5492,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.Int32Prop.fromProto(mImpl.getMaxLines());"
         errorLine2="                                                              ~~~~~~~~~~~">
@@ -5501,7 +5501,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasMultilineAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -5510,7 +5510,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getMultilineAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~">
@@ -5519,7 +5519,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasOverflow()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5528,7 +5528,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TextOverflowProp.fromProto(mImpl.getOverflow());"
         errorLine2="                                                        ~~~~~~~~~~~">
@@ -5537,7 +5537,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.hasLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLineHeight()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -5546,7 +5546,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.getLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.SpProp.fromProto(mImpl.getLineHeight());"
         errorLine2="                                                                ~~~~~~~~~~~~~">
@@ -5555,7 +5555,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpannable(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~~~~">
@@ -5564,7 +5564,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setSpannable(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -5573,7 +5573,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Spannable.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Spannable.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -5582,7 +5582,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1690284372);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5591,7 +5591,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addSpans can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addSpans(span.toSpanProto());"
         errorLine2="                      ~~~~~~~~">
@@ -5600,7 +5600,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5609,7 +5609,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(span.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -5618,7 +5618,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(span.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5627,7 +5627,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(span.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -5636,7 +5636,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -5645,7 +5645,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5654,7 +5654,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -5663,7 +5663,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5672,7 +5672,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5681,7 +5681,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(maxLines.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5690,7 +5690,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5699,7 +5699,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -5708,7 +5708,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5717,7 +5717,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(maxLines.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5726,7 +5726,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMaxLines can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5735,7 +5735,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                                                                    ~~~~~~~~">
@@ -5744,7 +5744,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMaxLines(TypesProto.Int32Prop.newBuilder().setValue(maxLines));"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -5753,7 +5753,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(3, maxLines);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5762,7 +5762,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMultilineAlignment(multilineAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -5771,7 +5771,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5780,7 +5780,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                             ~~~~~~~~~~~~~~~~~~~">
@@ -5789,7 +5789,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5798,7 +5798,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(multilineAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5807,7 +5807,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMultilineAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMultilineAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~">
@@ -5816,7 +5816,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.HorizontalAlignmentProp.newBuilder()"
         errorLine2="                                                               ~~~~~~~~~~">
@@ -5825,7 +5825,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -5834,7 +5834,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.HorizontalAlignment.forNumber("
         errorLine2="                                                                           ~~~~~~~~~">
@@ -5843,7 +5843,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, multilineAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5852,7 +5852,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setOverflow(overflow.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -5861,7 +5861,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5870,7 +5870,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -5879,7 +5879,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5888,7 +5888,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(overflow.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5897,7 +5897,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOverflow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setOverflow("
         errorLine2="                      ~~~~~~~~~~~">
@@ -5906,7 +5906,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflowProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        LayoutElementProto.TextOverflowProp.newBuilder()"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -5915,7 +5915,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.TextOverflow.forNumber(overflow)));"
         errorLine2="                                 ~~~~~~~~">
@@ -5924,7 +5924,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TextOverflow.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(LayoutElementProto.TextOverflow.forNumber(overflow)));"
         errorLine2="                                                                          ~~~~~~~~~">
@@ -5933,7 +5933,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, overflow);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5942,7 +5942,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLineHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLineHeight(lineHeight.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -5951,7 +5951,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -5960,7 +5960,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -5969,7 +5969,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -5978,7 +5978,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        7, checkNotNull(lineHeight.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -5987,7 +5987,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getContentsList().stream()"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -5996,7 +5996,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHorizontalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6005,7 +6005,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return HorizontalAlignmentProp.fromProto(mImpl.getHorizontalAlignment());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6014,7 +6014,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -6023,7 +6023,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -6032,7 +6032,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -6041,7 +6041,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -6050,7 +6050,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6059,7 +6059,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -6068,7 +6068,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setColumn(mImpl).build();"
         errorLine2="                                                                 ~~~~~~~~~">
@@ -6077,7 +6077,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setColumn(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -6086,7 +6086,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Column.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Column.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -6095,7 +6095,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1411218529);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6104,7 +6104,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6113,7 +6113,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -6122,7 +6122,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6131,7 +6131,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6140,7 +6140,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6149,7 +6149,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHorizontalAlignment(horizontalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6158,7 +6158,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6167,7 +6167,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                           ~~~~~~~~~~~~~~~~~~~">
@@ -6176,7 +6176,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                        ~~~~~~~~~~~~">
@@ -6185,7 +6185,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        checkNotNull(horizontalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6194,7 +6194,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHorizontalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHorizontalAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6203,7 +6203,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.HorizontalAlignmentProp.newBuilder()"
         errorLine2="                                                               ~~~~~~~~~~">
@@ -6212,7 +6212,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -6221,7 +6221,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="HorizontalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.HorizontalAlignment.forNumber("
         errorLine2="                                                                           ~~~~~~~~~">
@@ -6230,7 +6230,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, horizontalAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6239,7 +6239,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -6248,7 +6248,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6257,7 +6257,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -6266,7 +6266,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6275,7 +6275,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6284,7 +6284,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -6293,7 +6293,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6302,7 +6302,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -6311,7 +6311,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6320,7 +6320,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6329,7 +6329,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6338,7 +6338,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6347,7 +6347,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -6356,7 +6356,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6365,7 +6365,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6374,7 +6374,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getContentsList().stream()"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -6383,7 +6383,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasVerticalAlignment()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -6392,7 +6392,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlignment());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6401,7 +6401,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -6410,7 +6410,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getWidth());"
         errorLine2="                                                                           ~~~~~~~~">
@@ -6419,7 +6419,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasHeight()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -6428,7 +6428,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.containerDimensionFromProto(mImpl.getHeight());"
         errorLine2="                                                                           ~~~~~~~~~">
@@ -6437,7 +6437,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6446,7 +6446,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -6455,7 +6455,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setRow(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -6464,7 +6464,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setRow(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -6473,7 +6473,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Row.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Row.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -6482,7 +6482,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1537205448);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6491,7 +6491,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addContents(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6500,7 +6500,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -6509,7 +6509,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6518,7 +6518,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6527,7 +6527,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6536,7 +6536,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlignment(verticalAlignment.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -6545,7 +6545,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6554,7 +6554,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                            ~~~~~~~~~~~~~~~~~~~">
@@ -6563,7 +6563,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6572,7 +6572,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(verticalAlignment.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6581,7 +6581,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlignment can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlignment("
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~">
@@ -6590,7 +6590,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.VerticalAlignmentProp.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -6599,7 +6599,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -6608,7 +6608,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.VerticalAlignment.forNumber("
         errorLine2="                                                                         ~~~~~~~~~">
@@ -6617,7 +6617,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, verticalAlignment);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6626,7 +6626,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~">
@@ -6635,7 +6635,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6644,7 +6644,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -6653,7 +6653,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6662,7 +6662,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -6671,7 +6671,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeight can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeight(height.toContainerDimensionProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -6680,7 +6680,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6689,7 +6689,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -6698,7 +6698,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6707,7 +6707,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(height.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6716,7 +6716,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6725,7 +6725,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6734,7 +6734,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -6743,7 +6743,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6752,7 +6752,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6761,7 +6761,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getContentsList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getContentsList().stream()"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -6770,7 +6770,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasAnchorAngle()) {"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -6779,7 +6779,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DegreesProp.fromProto(mImpl.getAnchorAngle());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~">
@@ -6788,7 +6788,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasAnchorType()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6797,7 +6797,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ArcAnchorTypeProp.fromProto(mImpl.getAnchorType());"
         errorLine2="                                                         ~~~~~~~~~~~~~">
@@ -6806,7 +6806,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasVerticalAlign()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -6815,7 +6815,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return VerticalAlignmentProp.fromProto(mImpl.getVerticalAlign());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~">
@@ -6824,7 +6824,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -6833,7 +6833,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.Modifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                   ~~~~~~~~~~~~">
@@ -6842,7 +6842,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setArc(mImpl).build();"
         errorLine2="                                                                 ~~~~~~">
@@ -6851,7 +6851,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.LayoutElement.newBuilder().setArc(mImpl).build();"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -6860,7 +6860,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Arc.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Arc.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -6869,7 +6869,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(299028337);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6878,7 +6878,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addContents(content.toArcLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -6887,7 +6887,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -6896,7 +6896,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6905,7 +6905,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -6914,7 +6914,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6923,7 +6923,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnchorAngle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAnchorAngle(anchorAngle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -6932,7 +6932,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6941,7 +6941,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(anchorAngle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~">
@@ -6950,7 +6950,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(anchorAngle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -6959,7 +6959,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(anchorAngle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -6968,7 +6968,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAnchorType(anchorType.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -6977,7 +6977,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -6986,7 +6986,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(anchorType.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -6995,7 +6995,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(anchorType.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7004,7 +7004,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(anchorType.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7013,7 +7013,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAnchorType can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAnchorType("
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -7022,7 +7022,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorTypeProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.ArcAnchorTypeProp.newBuilder()"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -7031,7 +7031,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAnchorType.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(AlignmentProto.ArcAnchorType.forNumber(anchorType)));"
         errorLine2="                                                                       ~~~~~~~~~">
@@ -7040,7 +7040,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue(AlignmentProto.ArcAnchorType.forNumber(anchorType)));"
         errorLine2="                                 ~~~~~~~~">
@@ -7049,7 +7049,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(3, anchorType);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7058,7 +7058,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlign(verticalAlign.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -7067,7 +7067,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7076,7 +7076,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(verticalAlign.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                        ~~~~~~~~~~~~~~~~~~~">
@@ -7085,7 +7085,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(verticalAlign.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7094,7 +7094,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(verticalAlign.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7103,7 +7103,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVerticalAlign can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVerticalAlign("
         errorLine2="                      ~~~~~~~~~~~~~~~~">
@@ -7112,7 +7112,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignmentProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        AlignmentProto.VerticalAlignmentProp.newBuilder()"
         errorLine2="                                                             ~~~~~~~~~~">
@@ -7121,7 +7121,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                .setValue("
         errorLine2="                                 ~~~~~~~~">
@@ -7130,7 +7130,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="VerticalAlignment.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                        AlignmentProto.VerticalAlignment.forNumber(verticalAlign)));"
         errorLine2="                                                                         ~~~~~~~~~">
@@ -7139,7 +7139,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, verticalAlign);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7148,7 +7148,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7157,7 +7157,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7166,7 +7166,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7175,7 +7175,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7184,7 +7184,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7193,7 +7193,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasText()) {"
         errorLine2="                      ~~~~~~~">
@@ -7202,7 +7202,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.StringProp.fromProto(mImpl.getText());"
         errorLine2="                                                               ~~~~~~~">
@@ -7211,7 +7211,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasFontStyle()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7220,7 +7220,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return FontStyle.fromProto(mImpl.getFontStyle());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -7229,7 +7229,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7238,7 +7238,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                      ~~~~~~~~~~~~">
@@ -7247,7 +7247,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -7256,7 +7256,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setText(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~">
@@ -7265,7 +7265,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcText.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ArcText.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -7274,7 +7274,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(434391973);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7283,7 +7283,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(text.toProto());"
         errorLine2="                      ~~~~~~~">
@@ -7292,7 +7292,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7301,7 +7301,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
@@ -7310,7 +7310,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7319,7 +7319,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(text.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~">
@@ -7328,7 +7328,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                      ~~~~~~~">
@@ -7337,7 +7337,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                                                                 ~~~~~~~~">
@@ -7346,7 +7346,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setText(TypesProto.StringProp.newBuilder().setValue(text));"
         errorLine2="                                                    ~~~~~~~~~~">
@@ -7355,7 +7355,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, text.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7364,7 +7364,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFontStyle can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setFontStyle(fontStyle.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7373,7 +7373,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7382,7 +7382,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7391,7 +7391,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7400,7 +7400,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(fontStyle.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7409,7 +7409,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7418,7 +7418,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7427,7 +7427,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7436,7 +7436,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7445,7 +7445,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7454,7 +7454,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLength()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -7463,7 +7463,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DegreesProp.fromProto(mImpl.getLength());"
         errorLine2="                                                                     ~~~~~~~~~">
@@ -7472,7 +7472,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasThickness()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7481,7 +7481,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getThickness());"
         errorLine2="                                                                ~~~~~~~~~~~~">
@@ -7490,7 +7490,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -7499,7 +7499,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorBuilders.ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                               ~~~~~~~~">
@@ -7508,7 +7508,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7517,7 +7517,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                      ~~~~~~~~~~~~">
@@ -7526,7 +7526,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setLine(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -7535,7 +7535,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setLine(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~">
@@ -7544,7 +7544,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLine.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ArcLine.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -7553,7 +7553,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1371793535);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7562,7 +7562,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLength(length.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -7571,7 +7571,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7580,7 +7580,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -7589,7 +7589,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7598,7 +7598,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7607,7 +7607,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setThickness(thickness.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7616,7 +7616,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7625,7 +7625,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7634,7 +7634,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7643,7 +7643,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7652,7 +7652,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -7661,7 +7661,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7670,7 +7670,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -7679,7 +7679,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7688,7 +7688,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -7697,7 +7697,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7706,7 +7706,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7715,7 +7715,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7724,7 +7724,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7733,7 +7733,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7742,7 +7742,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLength()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -7751,7 +7751,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DegreesProp.fromProto(mImpl.getLength());"
         errorLine2="                                                                     ~~~~~~~~~">
@@ -7760,7 +7760,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasThickness()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7769,7 +7769,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getThickness());"
         errorLine2="                                                                ~~~~~~~~~~~~">
@@ -7778,7 +7778,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.hasModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasModifiers()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7787,7 +7787,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.getModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ModifiersBuilders.ArcModifiers.fromProto(mImpl.getModifiers());"
         errorLine2="                                                                      ~~~~~~~~~~~~">
@@ -7796,7 +7796,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -7805,7 +7805,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setSpacer(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -7814,7 +7814,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcSpacer.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ArcSpacer.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -7823,7 +7823,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-179760535);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7832,7 +7832,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLength can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLength(length.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -7841,7 +7841,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7850,7 +7850,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -7859,7 +7859,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7868,7 +7868,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(length.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7877,7 +7877,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7886,7 +7886,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7895,7 +7895,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7904,7 +7904,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(thickness.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7913,7 +7913,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setThickness can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setThickness(thickness.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7922,7 +7922,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setModifiers can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setModifiers(modifiers.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -7931,7 +7931,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -7940,7 +7940,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -7949,7 +7949,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -7958,7 +7958,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(modifiers.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -7967,7 +7967,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.hasContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasContent()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -7976,7 +7976,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return LayoutElementBuilders.layoutElementFromProto(mImpl.getContent());"
         errorLine2="                                                                          ~~~~~~~~~~">
@@ -7985,7 +7985,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.hasRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasRotateContents()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -7994,7 +7994,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.getRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.BoolProp.fromProto(mImpl.getRotateContents());"
         errorLine2="                                                             ~~~~~~~~~~~~~~~~~">
@@ -8003,7 +8003,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setAdapter(mImpl).build();"
         errorLine2="                                                       ~~~~~~~~~~">
@@ -8012,7 +8012,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return LayoutElementProto.ArcLayoutElement.newBuilder().setAdapter(mImpl).build();"
         errorLine2="                                                                    ~~~~~~~~~~">
@@ -8021,7 +8021,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcAdapter.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.ArcAdapter.newBuilder();"
         errorLine2="                                                  ~~~~~~~~~~">
@@ -8030,7 +8030,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(1696473935);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8039,7 +8039,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setContent can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setContent(content.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -8048,7 +8048,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                             ~~~~~~~~~~~~">
@@ -8057,7 +8057,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.addChildNode can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -8066,7 +8066,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                          ~~~~~~~~~~~~">
@@ -8075,7 +8075,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.addChildNode(checkNotNull(content.getFingerprint()));"
         errorLine2="                                                       ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8084,7 +8084,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRotateContents(rotateContents.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -8093,7 +8093,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8102,7 +8102,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(rotateContents.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                         ~~~~~~~~~~~~~~~~~~~">
@@ -8111,7 +8111,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(rotateContents.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8120,7 +8120,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(rotateContents.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8129,7 +8129,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRotateContents(TypesProto.BoolProp.newBuilder().setValue(rotateContents));"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -8138,7 +8138,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRotateContents can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRotateContents(TypesProto.BoolProp.newBuilder().setValue(rotateContents));"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -8147,7 +8147,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRotateContents(TypesProto.BoolProp.newBuilder().setValue(rotateContents));"
         errorLine2="                                                                         ~~~~~~~~">
@@ -8156,7 +8156,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(2, Boolean.hashCode(rotateContents));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8165,7 +8165,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasColumn()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -8174,7 +8174,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getColumn can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Column.fromProto(proto.getColumn(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~">
@@ -8183,7 +8183,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasRow()) {"
         errorLine2="                  ~~~~~~">
@@ -8192,7 +8192,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getRow can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Row.fromProto(proto.getRow(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -8201,7 +8201,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasBox()) {"
         errorLine2="                  ~~~~~~">
@@ -8210,7 +8210,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getBox can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Box.fromProto(proto.getBox(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -8219,7 +8219,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasSpacer()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -8228,7 +8228,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Spacer.fromProto(proto.getSpacer(), fingerprint);"
         errorLine2="                                          ~~~~~~~~~">
@@ -8237,7 +8237,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -8246,7 +8246,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Text.fromProto(proto.getText(), fingerprint);"
         errorLine2="                                        ~~~~~~~">
@@ -8255,7 +8255,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasImage()) {"
         errorLine2="                  ~~~~~~~~">
@@ -8264,7 +8264,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Image.fromProto(proto.getImage(), fingerprint);"
         errorLine2="                                         ~~~~~~~~">
@@ -8273,7 +8273,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasArc()) {"
         errorLine2="                  ~~~~~~">
@@ -8282,7 +8282,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getArc can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Arc.fromProto(proto.getArc(), fingerprint);"
         errorLine2="                                       ~~~~~~">
@@ -8291,7 +8291,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.hasSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasSpannable()) {"
         errorLine2="                  ~~~~~~~~~~~~">
@@ -8300,7 +8300,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="LayoutElement.getSpannable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return Spannable.fromProto(proto.getSpannable(), fingerprint);"
         errorLine2="                                             ~~~~~~~~~~~~">
@@ -8309,7 +8309,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasText()) {"
         errorLine2="                  ~~~~~~~">
@@ -8318,7 +8318,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getText can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ArcText.fromProto(proto.getText());"
         errorLine2="                                           ~~~~~~~">
@@ -8327,7 +8327,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasLine()) {"
         errorLine2="                  ~~~~~~~">
@@ -8336,7 +8336,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getLine can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ArcLine.fromProto(proto.getLine());"
         errorLine2="                                           ~~~~~~~">
@@ -8345,7 +8345,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasSpacer()) {"
         errorLine2="                  ~~~~~~~~~">
@@ -8354,7 +8354,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getSpacer can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ArcSpacer.fromProto(proto.getSpacer());"
         errorLine2="                                             ~~~~~~~~~">
@@ -8363,7 +8363,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.hasAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="        if (proto.hasAdapter()) {"
         errorLine2="                  ~~~~~~~~~~">
@@ -8372,7 +8372,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcLayoutElement.getAdapter can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return ArcAdapter.fromProto(proto.getAdapter());"
         errorLine2="                                              ~~~~~~~~~~">
@@ -8381,7 +8381,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.hasRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasRoot()) {"
         errorLine2="                      ~~~~~~~">
@@ -8390,7 +8390,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.getRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return LayoutElementBuilders.layoutElementFromProto(mImpl.getRoot());"
         errorLine2="                                                                          ~~~~~~~">
@@ -8399,7 +8399,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.parseFrom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return fromProto(LayoutElementProto.Layout.parseFrom(byteArray));"
         errorLine2="                                                           ~~~~~~~~~">
@@ -8408,7 +8408,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Layout.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    LayoutElementProto.Layout.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -8417,7 +8417,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRoot(root.toLayoutElementProto());"
         errorLine2="                      ~~~~~~~">
@@ -8426,7 +8426,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFingerprint can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.setFingerprint("
         errorLine2="                          ~~~~~~~~~~~~~~">
@@ -8435,7 +8435,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRoot can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                            TreeFingerprint.newBuilder().setRoot(fingerprintToProto(fingerprint)));"
         errorLine2="                                                         ~~~~~~~">
@@ -8444,7 +8444,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TreeFingerprint.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                            TreeFingerprint.newBuilder().setRoot(fingerprintToProto(fingerprint)));"
         errorLine2="                                            ~~~~~~~~~~">
@@ -8453,7 +8453,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="NodeFingerprint.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        FingerprintProto.NodeFingerprint.newBuilder();"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -8462,7 +8462,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.selfTypeValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (fingerprint.selfTypeValue() != 0) {"
         errorLine2="                                ~~~~~~~~~~~~~">
@@ -8471,7 +8471,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSelfTypeValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setSelfTypeValue(fingerprint.selfTypeValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~">
@@ -8480,7 +8480,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.selfTypeValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setSelfTypeValue(fingerprint.selfTypeValue());"
         errorLine2="                                                         ~~~~~~~~~~~~~">
@@ -8489,7 +8489,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.selfPropsValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (fingerprint.selfPropsValue() != 0) {"
         errorLine2="                                ~~~~~~~~~~~~~~">
@@ -8498,7 +8498,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSelfPropsValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setSelfPropsValue(fingerprint.selfPropsValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~">
@@ -8507,7 +8507,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.selfPropsValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setSelfPropsValue(fingerprint.selfPropsValue());"
         errorLine2="                                                          ~~~~~~~~~~~~~~">
@@ -8516,7 +8516,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.childNodesValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                if (fingerprint.childNodesValue() != 0) {"
         errorLine2="                                ~~~~~~~~~~~~~~~">
@@ -8525,7 +8525,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setChildNodesValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setChildNodesValue(fingerprint.childNodesValue());"
         errorLine2="                            ~~~~~~~~~~~~~~~~~~">
@@ -8534,7 +8534,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.childNodesValue can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.setChildNodesValue(fingerprint.childNodesValue());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~">
@@ -8543,7 +8543,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.childNodes can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                for (Fingerprint childNode : fingerprint.childNodes()) {"
         errorLine2="                                                         ~~~~~~~~~~">
@@ -8552,7 +8552,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addChildNodes can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    builder.addChildNodes(fingerprintToProto(childNode));"
         errorLine2="                            ~~~~~~~~~~~~~">
@@ -8561,7 +8561,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getId();"
         errorLine2="                         ~~~~~">
@@ -8570,7 +8570,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.hasOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasOnClick()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -8579,7 +8579,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.getOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ActionBuilders.actionFromProto(mImpl.getOnClick());"
         errorLine2="                                                            ~~~~~~~~~~">
@@ -8588,7 +8588,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Clickable.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Clickable.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -8597,7 +8597,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(595587995);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8606,7 +8606,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setId(id);"
         errorLine2="                      ~~~~~">
@@ -8615,7 +8615,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, id.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8624,7 +8624,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setOnClick can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setOnClick(onClick.toActionProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -8633,7 +8633,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8642,7 +8642,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(onClick.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~">
@@ -8651,7 +8651,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(onClick.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8660,7 +8660,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(onClick.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8669,7 +8669,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.getObsoleteContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getObsoleteContentDescription();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8678,7 +8678,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Semantics.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Semantics.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -8687,7 +8687,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1479823155);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8696,7 +8696,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setObsoleteContentDescription can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setObsoleteContentDescription(contentDescription);"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8705,7 +8705,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(4, contentDescription.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8714,7 +8714,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasEnd()) {"
         errorLine2="                      ~~~~~~">
@@ -8723,7 +8723,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getEnd());"
         errorLine2="                                                                ~~~~~~">
@@ -8732,7 +8732,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasStart()) {"
         errorLine2="                      ~~~~~~~~">
@@ -8741,7 +8741,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getStart());"
         errorLine2="                                                                ~~~~~~~~">
@@ -8750,7 +8750,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasTop()) {"
         errorLine2="                      ~~~~~~">
@@ -8759,7 +8759,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getTop());"
         errorLine2="                                                                ~~~~~~">
@@ -8768,7 +8768,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasBottom()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -8777,7 +8777,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getBottom());"
         errorLine2="                                                                ~~~~~~~~~">
@@ -8786,7 +8786,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.hasRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasRtlAware()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -8795,7 +8795,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.getRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TypeBuilders.BoolProp.fromProto(mImpl.getRtlAware());"
         errorLine2="                                                             ~~~~~~~~~~~">
@@ -8804,7 +8804,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Padding.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Padding.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -8813,7 +8813,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1120275440);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -8822,7 +8822,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEnd can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setEnd(end.toProto());"
         errorLine2="                      ~~~~~~">
@@ -8831,7 +8831,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8840,7 +8840,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(end.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~">
@@ -8849,7 +8849,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(end.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8858,7 +8858,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(end.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
@@ -8867,7 +8867,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStart can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setStart(start.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -8876,7 +8876,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8885,7 +8885,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(start.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -8894,7 +8894,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(start.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8903,7 +8903,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(start.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -8912,7 +8912,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTop can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setTop(top.toProto());"
         errorLine2="                      ~~~~~~">
@@ -8921,7 +8921,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8930,7 +8930,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(top.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~">
@@ -8939,7 +8939,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(top.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8948,7 +8948,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(top.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~">
@@ -8957,7 +8957,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBottom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setBottom(bottom.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -8966,7 +8966,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -8975,7 +8975,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(bottom.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -8984,7 +8984,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(bottom.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -8993,7 +8993,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(bottom.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9002,7 +9002,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRtlAware(rtlAware.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -9011,7 +9011,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9020,7 +9020,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(rtlAware.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -9029,7 +9029,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(rtlAware.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9038,7 +9038,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(rtlAware.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9047,7 +9047,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRtlAware(TypesProto.BoolProp.newBuilder().setValue(rtlAware));"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -9056,7 +9056,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRtlAware can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRtlAware(TypesProto.BoolProp.newBuilder().setValue(rtlAware));"
         errorLine2="                      ~~~~~~~~~~~">
@@ -9065,7 +9065,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRtlAware(TypesProto.BoolProp.newBuilder().setValue(rtlAware));"
         errorLine2="                                                                   ~~~~~~~~">
@@ -9074,7 +9074,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(5, Boolean.hashCode(rtlAware));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9083,7 +9083,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.hasWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasWidth()) {"
         errorLine2="                      ~~~~~~~~">
@@ -9092,7 +9092,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getWidth());"
         errorLine2="                                                                ~~~~~~~~">
@@ -9101,7 +9101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -9110,7 +9110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorBuilders.ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                               ~~~~~~~~">
@@ -9119,7 +9119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Border.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final ModifiersProto.Border.Builder mImpl = ModifiersProto.Border.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -9128,7 +9128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(2085330827);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9137,7 +9137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidth can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidth(width.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -9146,7 +9146,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9155,7 +9155,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -9164,7 +9164,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9173,7 +9173,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(width.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -9182,7 +9182,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -9191,7 +9191,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9200,7 +9200,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -9209,7 +9209,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9218,7 +9218,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -9227,7 +9227,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.hasRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasRadius()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -9236,7 +9236,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.getRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DimensionBuilders.DpProp.fromProto(mImpl.getRadius());"
         errorLine2="                                                                ~~~~~~~~~">
@@ -9245,7 +9245,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Corner.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final ModifiersProto.Corner.Builder mImpl = ModifiersProto.Corner.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -9254,7 +9254,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-623478338);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9263,7 +9263,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRadius can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setRadius(radius.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -9272,7 +9272,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9281,7 +9281,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(radius.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -9290,7 +9290,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(radius.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9299,7 +9299,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(radius.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9308,7 +9308,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasColor()) {"
         errorLine2="                      ~~~~~~~~">
@@ -9317,7 +9317,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ColorBuilders.ColorProp.fromProto(mImpl.getColor());"
         errorLine2="                                                               ~~~~~~~~">
@@ -9326,7 +9326,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.hasCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasCorner()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -9335,7 +9335,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.getCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Corner.fromProto(mImpl.getCorner());"
         errorLine2="                                              ~~~~~~~~~">
@@ -9344,7 +9344,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Background.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Background.newBuilder();"
         errorLine2="                                              ~~~~~~~~~~">
@@ -9353,7 +9353,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(374507572);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9362,7 +9362,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setColor can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setColor(color.toProto());"
         errorLine2="                      ~~~~~~~~">
@@ -9371,7 +9371,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9380,7 +9380,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                ~~~~~~~~~~~~~~~~~~~">
@@ -9389,7 +9389,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9398,7 +9398,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(color.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~">
@@ -9407,7 +9407,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setCorner can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setCorner(corner.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -9416,7 +9416,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9425,7 +9425,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(corner.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -9434,7 +9434,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(corner.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9443,7 +9443,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(corner.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9452,7 +9452,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ElementMetadata.getTagData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getTagData().toByteArray();"
         errorLine2="                         ~~~~~~~~~~">
@@ -9461,7 +9461,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ElementMetadata.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.ElementMetadata.newBuilder();"
         errorLine2="                                                   ~~~~~~~~~~">
@@ -9470,7 +9470,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-589294723);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9479,7 +9479,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setTagData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setTagData(ByteString.copyFrom(tagData));"
         errorLine2="                      ~~~~~~~~~~">
@@ -9488,7 +9488,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Arrays.hashCode(tagData));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9497,7 +9497,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9506,7 +9506,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -9515,7 +9515,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9524,7 +9524,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Semantics.fromProto(mImpl.getSemantics());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -9533,7 +9533,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasPadding()) {"
         errorLine2="                      ~~~~~~~~~~">
@@ -9542,7 +9542,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Padding.fromProto(mImpl.getPadding());"
         errorLine2="                                               ~~~~~~~~~~">
@@ -9551,7 +9551,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasBorder()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -9560,7 +9560,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Border.fromProto(mImpl.getBorder());"
         errorLine2="                                              ~~~~~~~~~">
@@ -9569,7 +9569,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasBackground()) {"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -9578,7 +9578,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Background.fromProto(mImpl.getBackground());"
         errorLine2="                                                  ~~~~~~~~~~~~~">
@@ -9587,7 +9587,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.hasMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasMetadata()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -9596,7 +9596,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.getMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return ElementMetadata.fromProto(mImpl.getMetadata());"
         errorLine2="                                                       ~~~~~~~~~~~">
@@ -9605,7 +9605,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Modifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.Modifiers.newBuilder();"
         errorLine2="                                             ~~~~~~~~~~">
@@ -9614,7 +9614,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-170942531);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9623,7 +9623,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9632,7 +9632,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9641,7 +9641,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -9650,7 +9650,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9659,7 +9659,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9668,7 +9668,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setSemantics(semantics.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9677,7 +9677,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9686,7 +9686,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -9695,7 +9695,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9704,7 +9704,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9713,7 +9713,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setPadding can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setPadding(padding.toProto());"
         errorLine2="                      ~~~~~~~~~~">
@@ -9722,7 +9722,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9731,7 +9731,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(padding.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~">
@@ -9740,7 +9740,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(padding.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9749,7 +9749,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        3, checkNotNull(padding.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9758,7 +9758,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBorder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setBorder(border.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -9767,7 +9767,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9776,7 +9776,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(border.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
@@ -9785,7 +9785,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(border.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9794,7 +9794,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        4, checkNotNull(border.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9803,7 +9803,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setBackground can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setBackground(background.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -9812,7 +9812,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9821,7 +9821,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(background.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                     ~~~~~~~~~~~~~~~~~~~">
@@ -9830,7 +9830,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(background.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9839,7 +9839,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        5, checkNotNull(background.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9848,7 +9848,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setMetadata can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setMetadata(metadata.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -9857,7 +9857,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9866,7 +9866,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(metadata.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~">
@@ -9875,7 +9875,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(metadata.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9884,7 +9884,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        6, checkNotNull(metadata.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9893,7 +9893,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9902,7 +9902,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -9911,7 +9911,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.hasSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasSemantics()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9920,7 +9920,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.getSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Semantics.fromProto(mImpl.getSemantics());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -9929,7 +9929,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ArcModifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.ArcModifiers.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -9938,7 +9938,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1648736168);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9947,7 +9947,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -9956,7 +9956,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -9965,7 +9965,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -9974,7 +9974,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -9983,7 +9983,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -9992,7 +9992,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setSemantics can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setSemantics(semantics.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -10001,7 +10001,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -10010,7 +10010,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -10019,7 +10019,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -10028,7 +10028,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        2, checkNotNull(semantics.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10037,7 +10037,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.hasClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasClickable()) {"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -10046,7 +10046,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.getClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Clickable.fromProto(mImpl.getClickable());"
         errorLine2="                                                 ~~~~~~~~~~~~">
@@ -10055,7 +10055,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="SpanModifiers.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ModifiersProto.SpanModifiers.newBuilder();"
         errorLine2="                                                 ~~~~~~~~~~">
@@ -10064,7 +10064,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1318656482);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10073,7 +10073,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setClickable can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setClickable(clickable.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -10082,7 +10082,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate("
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -10091,7 +10091,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.aggregateValueAsInt can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                                                    ~~~~~~~~~~~~~~~~~~~">
@@ -10100,7 +10100,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                           ~~~~~~~~~~~~">
@@ -10109,7 +10109,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Preconditions.checkNotNull can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        1, checkNotNull(clickable.getFingerprint()).aggregateValueAsInt());"
         errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10118,7 +10118,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DeviceParameters.fromProto(mImpl.getDeviceConfiguration());"
         errorLine2="                                        ~~~~~~~~~">
@@ -10127,7 +10127,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DeviceParameters.fromProto("
         errorLine2="                                        ~~~~~~~~~">
@@ -10136,7 +10136,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        DeviceParametersProto.DeviceParameters.getDefaultInstance());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -10145,7 +10145,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return State.fromProto(mImpl.getCurrentState());"
         errorLine2="                             ~~~~~~~~~">
@@ -10154,7 +10154,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return State.fromProto(StateProto.State.getDefaultInstance());"
         errorLine2="                             ~~~~~~~~~">
@@ -10163,7 +10163,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return State.fromProto(StateProto.State.getDefaultInstance());"
         errorLine2="                                                        ~~~~~~~~~~~~~~~~~~">
@@ -10172,7 +10172,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setDeviceConfiguration(deviceConfiguration.toProto());"
         errorLine2="                                                                 ~~~~~~~">
@@ -10181,7 +10181,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setCurrentState(currentState.toProto());"
         errorLine2="                                                   ~~~~~~~">
@@ -10190,7 +10190,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DeviceParameters.fromProto(mImpl.getDeviceConfiguration());"
         errorLine2="                                        ~~~~~~~~~">
@@ -10199,7 +10199,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return DeviceParameters.fromProto("
         errorLine2="                                        ~~~~~~~~~">
@@ -10208,7 +10208,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.getDefaultInstance can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                        DeviceParametersProto.DeviceParameters.getDefaultInstance());"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~">
@@ -10217,7 +10217,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setDeviceConfiguration(deviceConfiguration.toProto());"
         errorLine2="                                                                 ~~~~~~~">
@@ -10226,7 +10226,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByResId.getResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getResourceId();"
         errorLine2="                         ~~~~~~~~~~~~~">
@@ -10235,7 +10235,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="AndroidImageResourceByResId.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ResourceProto.AndroidImageResourceByResId.newBuilder();"
         errorLine2="                                                              ~~~~~~~~~~">
@@ -10244,7 +10244,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setResourceId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setResourceId(resourceId);"
         errorLine2="                      ~~~~~~~~~~~~~">
@@ -10253,7 +10253,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getData().toByteArray();"
         errorLine2="                         ~~~~~~~">
@@ -10262,7 +10262,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getWidthPx();"
         errorLine2="                         ~~~~~~~~~~">
@@ -10271,7 +10271,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getHeightPx();"
         errorLine2="                         ~~~~~~~~~~~">
@@ -10280,7 +10280,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.getNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getFormat().getNumber();"
         errorLine2="                                     ~~~~~~~~~">
@@ -10289,7 +10289,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.getFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getFormat().getNumber();"
         errorLine2="                         ~~~~~~~~~">
@@ -10298,7 +10298,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="InlineImageResource.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ResourceProto.InlineImageResource.newBuilder();"
         errorLine2="                                                      ~~~~~~~~~~">
@@ -10307,7 +10307,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setData can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setData(ByteString.copyFrom(data));"
         errorLine2="                      ~~~~~~~">
@@ -10316,7 +10316,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setWidthPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setWidthPx(widthPx);"
         errorLine2="                      ~~~~~~~~~~">
@@ -10325,7 +10325,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setHeightPx can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setHeightPx(heightPx);"
         errorLine2="                      ~~~~~~~~~~~">
@@ -10334,7 +10334,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setFormat can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setFormat(ResourceProto.ImageFormat.forNumber(format));"
         errorLine2="                      ~~~~~~~~~">
@@ -10343,7 +10343,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageFormat.forNumber can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setFormat(ResourceProto.ImageFormat.forNumber(format));"
         errorLine2="                                                          ~~~~~~~~~">
@@ -10352,7 +10352,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasAndroidResourceByResId()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10361,7 +10361,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return AndroidImageResourceByResId.fromProto(mImpl.getAndroidResourceByResId());"
         errorLine2="                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10370,7 +10370,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.hasInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasInlineResource()) {"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -10379,7 +10379,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.getInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return InlineImageResource.fromProto(mImpl.getInlineResource());"
         errorLine2="                                                           ~~~~~~~~~~~~~~~~~">
@@ -10388,7 +10388,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ImageResource.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ResourceProto.ImageResource.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -10397,7 +10397,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setAndroidResourceByResId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setAndroidResourceByResId(androidResourceByResId.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10406,7 +10406,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setInlineResource can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setInlineResource(inlineResource.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~">
@@ -10415,7 +10415,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getVersion();"
         errorLine2="                         ~~~~~~~~~~">
@@ -10424,7 +10424,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.getIdToImageMap can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    mImpl.getIdToImageMap().entrySet()) {"
         errorLine2="                          ~~~~~~~~~~~~~~~">
@@ -10433,7 +10433,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.parseFrom can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return fromProto(ResourceProto.Resources.parseFrom(byteArray));"
         errorLine2="                                                         ~~~~~~~~~">
@@ -10442,7 +10442,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    ResourceProto.Resources.newBuilder();"
         errorLine2="                                            ~~~~~~~~~~">
@@ -10451,7 +10451,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setVersion(version);"
         errorLine2="                      ~~~~~~~~~~">
@@ -10460,7 +10460,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.putIdToImage can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.putIdToImage(id, image.toProto());"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -10469,7 +10469,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.getLastClickableId can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getLastClickableId();"
         errorLine2="                         ~~~~~~~~~~~~~~~~~~">
@@ -10478,7 +10478,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final StateProto.State.Builder mImpl = StateProto.State.newBuilder();"
         errorLine2="                                                                            ~~~~~~~~~~">
@@ -10487,7 +10487,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(616326811);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10496,7 +10496,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return Timeline.fromProto(mImpl.getTileTimeline());"
         errorLine2="                                ~~~~~~~~~">
@@ -10505,7 +10505,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return State.fromProto(mImpl.getState());"
         errorLine2="                             ~~~~~~~~~">
@@ -10514,7 +10514,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setTileTimeline(tileTimeline.toProto());"
         errorLine2="                                                   ~~~~~~~">
@@ -10523,7 +10523,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="State.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setState(state.toProto());"
         errorLine2="                                     ~~~~~~~">
@@ -10532,34 +10532,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="        ResolvableFuture&lt;Resources> result = ResolvableFuture.create();"
-        errorLine2="                                                              ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                        result.set("
-        errorLine2="                               ~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                                Resources.fromProto(legacyResourcesRequestResult.get().toProto()));"
-        errorLine2="                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.fromProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                Resources.fromProto(legacyResourcesRequestResult.get().toProto()));"
         errorLine2="                                          ~~~~~~~~~">
@@ -10568,16 +10541,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="                        result.setException(e);"
-        errorLine2="                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.hasRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                .hasRendererSchemaVersion()) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10586,7 +10550,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                    .setRendererSchemaVersion(DEFAULT_VERSION)"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10595,7 +10559,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="DeviceParameters.hasRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                .hasRendererSchemaVersion()) {"
         errorLine2="                                                 ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10604,7 +10568,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setRendererSchemaVersion can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                    .setRendererSchemaVersion(DEFAULT_VERSION)"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10613,7 +10577,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                    updateResources(callback, resources.toProto().toByteArray());"
         errorLine2="                                                                        ~~~~~~~">
@@ -10622,7 +10586,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Resources.toProto can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                                                                .toProto()"
         errorLine2="                                                                 ~~~~~~~">
@@ -10631,25 +10595,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="        ResolvableFuture&lt;T> errorFuture = ResolvableFuture.create();"
-        errorLine2="                                                           ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.tiles`)"
-        errorLine1="        errorFuture.setException(throwable);"
-        errorLine2="                    ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/tiles/TileService.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getStartMillis();"
         errorLine2="                         ~~~~~~~~~~~~~~">
@@ -10658,7 +10604,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.getEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getEndMillis();"
         errorLine2="                         ~~~~~~~~~~~~">
@@ -10667,7 +10613,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimeInterval.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    TimelineProto.TimeInterval.newBuilder();"
         errorLine2="                                               ~~~~~~~~~~">
@@ -10676,7 +10622,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setStartMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setStartMillis(startMillis);"
         errorLine2="                      ~~~~~~~~~~~~~~">
@@ -10685,7 +10631,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setEndMillis can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setEndMillis(endMillis);"
         errorLine2="                      ~~~~~~~~~~~~">
@@ -10694,7 +10640,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasValidity()) {"
         errorLine2="                      ~~~~~~~~~~~">
@@ -10703,7 +10649,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return TimeInterval.fromProto(mImpl.getValidity());"
         errorLine2="                                                    ~~~~~~~~~~~">
@@ -10712,7 +10658,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.hasLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            if (mImpl.hasLayout()) {"
         errorLine2="                      ~~~~~~~~~">
@@ -10721,7 +10667,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.getLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                return LayoutElementBuilders.Layout.fromProto(mImpl.getLayout());"
         errorLine2="                                                                    ~~~~~~~~~">
@@ -10730,7 +10676,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="TimelineEntry.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    TimelineProto.TimelineEntry.newBuilder();"
         errorLine2="                                                ~~~~~~~~~~">
@@ -10739,7 +10685,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValidity can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValidity(validity.toProto());"
         errorLine2="                      ~~~~~~~~~~~">
@@ -10748,7 +10694,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setLayout can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setLayout(layout.toProto());"
         errorLine2="                      ~~~~~~~~~">
@@ -10757,7 +10703,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.getTimelineEntriesList can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            for (TimelineProto.TimelineEntry item : mImpl.getTimelineEntriesList()) {"
         errorLine2="                                                          ~~~~~~~~~~~~~~~~~~~~~~">
@@ -10766,7 +10712,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Timeline.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                    TimelineProto.Timeline.newBuilder();"
         errorLine2="                                           ~~~~~~~~~~">
@@ -10775,7 +10721,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.addTimelineEntries can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.addTimelineEntries(timelineEntry.toProto());"
         errorLine2="                      ~~~~~~~~~~~~~~~~~~">
@@ -10784,7 +10730,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -10793,7 +10739,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Int32Prop.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final TypesProto.Int32Prop.Builder mImpl = TypesProto.Int32Prop.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -10802,7 +10748,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-1809132005);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10811,7 +10757,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -10820,7 +10766,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value);"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -10829,7 +10775,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -10838,7 +10784,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="StringProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final TypesProto.StringProp.Builder mImpl = TypesProto.StringProp.newBuilder();"
         errorLine2="                                                                                      ~~~~~~~~~~">
@@ -10847,7 +10793,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-319420356);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10856,7 +10802,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -10865,7 +10811,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, value.hashCode());"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -10874,7 +10820,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -10883,7 +10829,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="FloatProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final TypesProto.FloatProp.Builder mImpl = TypesProto.FloatProp.newBuilder();"
         errorLine2="                                                                                    ~~~~~~~~~~">
@@ -10892,7 +10838,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(399943127);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10901,7 +10847,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -10910,7 +10856,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Float.floatToIntBits(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
@@ -10919,7 +10865,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.getValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            return mImpl.getValue();"
         errorLine2="                         ~~~~~~~~">
@@ -10928,7 +10874,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="BoolProp.newBuilder can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final TypesProto.BoolProp.Builder mImpl = TypesProto.BoolProp.newBuilder();"
         errorLine2="                                                                                  ~~~~~~~~~~">
@@ -10937,7 +10883,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="            private final Fingerprint mFingerprint = new Fingerprint(-278424864);"
         errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
@@ -10946,7 +10892,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Builder.setValue can only be called from within the same library group (referenced groupId=`` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mImpl.setValue(value);"
         errorLine2="                      ~~~~~~~~">
@@ -10955,7 +10901,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="Fingerprint.recordPropertyUpdate can only be called from within the same library group (referenced groupId=`androidx.wear.protolayout` from groupId=`androidx.wear.tiles`)"
         errorLine1="                mFingerprint.recordPropertyUpdate(1, Boolean.hashCode(value));"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~~~">
diff --git a/wear/watchface/watchface-client-guava/lint-baseline.xml b/wear/watchface/watchface-client-guava/lint-baseline.xml
deleted file mode 100644
index fe1e9d36..0000000
--- a/wear/watchface/watchface-client-guava/lint-baseline.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            val future = ResolvableFuture.create&lt;T>()"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="AbstractResolvableFuture.addListener can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                future.addListener("
-        errorLine2="                       ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="AbstractResolvableFuture.isCancelled can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                        if (future.isCancelled) {"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="AbstractResolvableFuture.isCancelled can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                        if (future.isCancelled) {"
-        errorLine2="                                   ~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    future.set(block())"
-        errorLine2="                           ~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    future.set(block())"
-        errorLine2="                               ~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    future.setException(e)"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/client/ListenableWatchFaceControlClient.kt"/>
-    </issue>
-
-</issues>
diff --git a/wear/watchface/watchface-complications-data/lint-baseline.xml b/wear/watchface/watchface-complications-data/lint-baseline.xml
index bce397f..4defde3 100644
--- a/wear/watchface/watchface-complications-data/lint-baseline.xml
+++ b/wear/watchface/watchface-complications-data/lint-baseline.xml
@@ -73,22 +73,4 @@
             file="src/main/aidl/android/support/wearable/complications/IProviderInfoService.aidl"/>
     </issue>
 
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/complications/data/DefaultComplicationDataSourcePolicyWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/complications/data/DefaultComplicationDataSourcePolicyWireFormat.java"/>
-    </issue>
-
 </issues>
diff --git a/wear/watchface/watchface-complications-rendering/lint-baseline.xml b/wear/watchface/watchface-complications-rendering/lint-baseline.xml
deleted file mode 100644
index aa857e4..0000000
--- a/wear/watchface/watchface-complications-rendering/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            if (!checkNotNull(mComplicationData.isColorRampInterpolated())) {"
-        errorLine2="                 ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/complications/rendering/ComplicationRenderer.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="Preconditions.checkNotNull can only be called from within the same library group prefix (referenced groupId=`androidx.core` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            if (!checkNotNull(mComplicationData.isColorRampInterpolated())) {"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/complications/rendering/ComplicationRenderer.java"/>
-    </issue>
-
-</issues>
diff --git a/wear/watchface/watchface-data/lint-baseline.xml b/wear/watchface/watchface-data/lint-baseline.xml
index 278d918..3e6e6b2 100644
--- a/wear/watchface/watchface-data/lint-baseline.xml
+++ b/wear/watchface/watchface-data/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
+<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="cli" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
         id="RequireUnstableAidlAnnotation"
@@ -334,526 +334,4 @@
             file="src/main/aidl/androidx/wear/watchface/data/WatchUiState.aidl"/>
     </issue>
 
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/BoundingArcWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/BoundingArcWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/ComplicationOverlayWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/ComplicationOverlayWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/ComplicationRenderParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/ComplicationSlotMetadataWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/ComplicationSlotMetadataWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/ComplicationStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/ComplicationStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/DefaultProviderPoliciesParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/DefaultProviderPoliciesParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/DeviceConfig.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/DeviceConfig.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/data/EditorStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/data/EditorStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetComplicationSlotMetadataParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetComplicationSlotMetadataParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetUserStyleFlavorsParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetUserStyleFlavorsParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetUserStyleSchemaParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/GetUserStyleSchemaParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/HeadlessWatchFaceInstanceParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/HeadlessWatchFaceInstanceParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndComplicationDataWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndComplicationDataWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndComplicationStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndComplicationStateWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndTapEventWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/IdAndTapEventWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/IdTypeAndDefaultProviderPolicyWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/IdTypeAndDefaultProviderPolicyWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/LayerParameterWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/LayerParameterWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/OptionWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/OptionWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/RenderParametersWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/RenderParametersWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleFlavorWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleFlavorWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleFlavorsWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleFlavorsWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleSchemaWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleSchemaWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleSettingWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleSettingWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/style/data/UserStyleWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/WallpaperInteractiveWatchFaceInstanceParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/WallpaperInteractiveWatchFaceInstanceParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                               ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchFaceColorsWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchFaceColorsWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchFaceOverlayStyleWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchFaceOverlayStyleWireFormat.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/control/data/WatchFaceRenderParams.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        parcel.writeParcelable(ParcelUtils.toParcelable(this), flags);"
-        errorLine2="                                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchUiState.java"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromParcelable can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    return ParcelUtils.fromParcelable("
-        errorLine2="                                       ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/data/WatchUiState.java"/>
-    </issue>
-
 </issues>
diff --git a/wear/watchface/watchface-editor-guava/lint-baseline.xml b/wear/watchface/watchface-editor-guava/lint-baseline.xml
deleted file mode 100644
index ef35e65..0000000
--- a/wear/watchface/watchface-editor-guava/lint-baseline.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            val result = ResolvableFuture.create&lt;ListenableEditorSession?>()"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            val result = ResolvableFuture.create&lt;ListenableEditorSession?>()"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    result.set("
-        errorLine2="                           ~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    result.set("
-        errorLine2="                           ~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                        ListenableEditorSession(EditorSession.createOnWatchEditorSession(activity))"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                        ListenableEditorSession(EditorSession.createOnWatchEditorSession(activity))"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    result.setException(e)"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    result.setException(e)"
-        errorLine2="                           ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.create can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="        val future = ResolvableFuture.create&lt;ChosenComplicationDataSource?>()"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                future.set("
-        errorLine2="                       ~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.set can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    wrappedEditorSession.openComplicationDataSourceChooser(complicationSlotId)"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ResolvableFuture.setException can only be called from within the same library group prefix (referenced groupId=`androidx.concurrent` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                future.setException(e)"
-        errorLine2="                       ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/editor/ListenableEditorSession.kt"/>
-    </issue>
-
-</issues>
diff --git a/wear/watchface/watchface/lint-baseline.xml b/wear/watchface/watchface/lint-baseline.xml
index a5991f9..4af149b 100644
--- a/wear/watchface/watchface/lint-baseline.xml
+++ b/wear/watchface/watchface/lint-baseline.xml
@@ -2,24 +2,6 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
-        message="ParcelUtils.fromInputStream can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="                    ParcelUtils.fromInputStream&lt;WallpaperInteractiveWatchFaceInstanceParams>(reader)"
-        errorLine2="                                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"/>
-    </issue>
-
-    <issue
-        id="RestrictedApi"
-        message="ParcelUtils.toOutputStream can only be called from within the same library group prefix (referenced groupId=`androidx.versionedparcelable` with prefix androidx from groupId=`androidx.wear.watchface`)"
-        errorLine1="            writer.use { ParcelUtils.toOutputStream(prefs, writer) }"
-        errorLine2="                                     ~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/androidx/wear/watchface/WatchFaceService.kt"/>
-    </issue>
-
-    <issue
         id="VisibleForTests"
         message="This method should only be accessed from tests or within private scope"
         errorLine1="            complicationSlotsManager.watchState,"
diff --git a/webkit/integration-tests/testapp/lint-baseline.xml b/webkit/integration-tests/testapp/lint-baseline.xml
index 7d54279..f050d14 100644
--- a/webkit/integration-tests/testapp/lint-baseline.xml
+++ b/webkit/integration-tests/testapp/lint-baseline.xml
@@ -2,7 +2,25 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
+        message="WebViewFeature.DOCUMENT_START_SCRIPT can only be accessed from within the same library group (referenced groupId=`androidx.webkit` from groupId=`androidx.webkit.integration-tests`)"
+        errorLine1="        if (!WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT)) {"
+        errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/webkit/DocumentStartJavaScriptActivity.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
+        message="WebViewCompat.addDocumentStartJavaScript can only be called from within the same library group (referenced groupId=`androidx.webkit` from groupId=`androidx.webkit.integration-tests`)"
+        errorLine1="        WebViewCompat.addDocumentStartJavaScript(webView, jsCode, allowedOriginRules);"
+        errorLine2="                      ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/example/androidx/webkit/DocumentStartJavaScriptActivity.java"/>
+    </issue>
+
+    <issue
+        id="RestrictedApiAndroidX"
         message="WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST can only be accessed from within the same library group (referenced groupId=`androidx.webkit` from groupId=`androidx.webkit.integration-tests`)"
         errorLine1="        if (!WebViewFeature.isFeatureSupported(WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST)) {"
         errorLine2="                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/window/window/lint-baseline.xml b/window/window/lint-baseline.xml
index f3ed016..848181a 100644
--- a/window/window/lint-baseline.xml
+++ b/window/window/lint-baseline.xml
@@ -2,7 +2,7 @@
 <issues format="6" by="lint 8.2.0-alpha15" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0-alpha15)" variant="all" version="8.2.0-alpha15">
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_3 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="    return ExtensionsUtil.safeVendorApiLevel >= WindowExtensions.VENDOR_API_LEVEL_3"
         errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~">
@@ -11,7 +11,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_1 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="            WindowExtensions.VENDOR_API_LEVEL_1 -> api1Impl.translateCompat(splitInfo)"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -20,7 +20,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="            WindowExtensions.VENDOR_API_LEVEL_2 -> api2Impl.translateCompat(splitInfo)"
         errorLine2="                             ~~~~~~~~~~~~~~~~~~">
@@ -29,7 +29,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ActivityStack.getToken can only be called from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="                        primaryActivityStack.token,"
         errorLine2="                                             ~~~~~">
@@ -38,7 +38,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ActivityStack.getToken can only be called from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="                        primaryActivityStack.token,"
         errorLine2="                                             ~~~~~">
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ActivityStack.getToken can only be called from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="                        secondaryActivityStack.token,"
         errorLine2="                                               ~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ActivityStack.getToken can only be called from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="                        secondaryActivityStack.token,"
         errorLine2="                                               ~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        if (vendorApiLevel &lt; WindowExtensions.VENDOR_API_LEVEL_2) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        require(vendorApiLevel >= WindowExtensions.VENDOR_API_LEVEL_2)"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        require(vendorApiLevel >= WindowExtensions.VENDOR_API_LEVEL_2)"
         errorLine2="                                                   ~~~~~~~~~~~~~~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        if (vendorApiLevel &lt; WindowExtensions.VENDOR_API_LEVEL_2) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        if (vendorApiLevel &lt; WindowExtensions.VENDOR_API_LEVEL_2) {"
         errorLine2="                                              ~~~~~~~~~~~~~~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        if (ExtensionsUtil.safeVendorApiLevel &lt; VENDOR_API_LEVEL_2) {"
         errorLine2="                                                ~~~~~~~~~~~~~~~~~~">
@@ -119,7 +119,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_2 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        ExtensionsUtil.safeVendorApiLevel >= VENDOR_API_LEVEL_2"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -128,7 +128,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_3 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        ExtensionsUtil.safeVendorApiLevel >= VENDOR_API_LEVEL_3"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
@@ -137,7 +137,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="WindowExtensions.VENDOR_API_LEVEL_3 can only be accessed from within the same library group (referenced groupId=`androidx.window.extensions` from groupId=`androidx.window`)"
         errorLine1="        ExtensionsUtil.safeVendorApiLevel >= VENDOR_API_LEVEL_3"
         errorLine2="                                             ~~~~~~~~~~~~~~~~~~">
diff --git a/work/integration-tests/testapp/lint-baseline.xml b/work/integration-tests/testapp/lint-baseline.xml
index f41c3d1..20fb715 100644
--- a/work/integration-tests/testapp/lint-baseline.xml
+++ b/work/integration-tests/testapp/lint-baseline.xml
@@ -47,7 +47,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        remoteWorkManager.enqueue(listOf(request)).await()"
         errorLine2="                                                   ~~~~~">
@@ -56,7 +56,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        ).await()"
         errorLine2="          ~~~~~">
@@ -65,7 +65,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        ).await()"
         errorLine2="          ~~~~~">
@@ -74,7 +74,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="            .await()"
         errorLine2="             ~~~~~">
@@ -83,7 +83,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        remoteWorkManager.cancelAllWorkByTag(WORK_TAG).await()"
         errorLine2="                                                       ~~~~~">
@@ -92,7 +92,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        remoteWorkManager.cancelAllWork().await()"
         errorLine2="                                          ~~~~~">
@@ -101,7 +101,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="        val workInfoList: List&lt;WorkInfo> = remoteWorkManager.getWorkInfos(query).await()"
         errorLine2="                                                                                 ~~~~~">
@@ -110,7 +110,7 @@
     </issue>
 
     <issue
-        id="RestrictedApi"
+        id="RestrictedApiAndroidX"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`androidx.work.integration-tests`)"
         errorLine1="                    setProgressAsync(progress).await()"
         errorLine2="                                               ~~~~~">