Merge "ASL update fields to finalized declarations, part 1" into main

...ib/java/com/android/asllib/marshallable/DataCategory.java

.../com/android/asllib/marshallable/DataCategoryFactory.java

.../lib/java/com/android/asllib/marshallable/DataLabels.java

...va/com/android/asllib/marshallable/DataLabelsFactory.java

...java/com/android/asllib/marshallable/DataTypeFactory.java

...com/android/asllib/marshallable/SystemAppSafetyLabel.java

...roid/asllib/marshallable/SystemAppSafetyLabelFactory.java

...undles/src/lib/java/com/android/asllib/util/XmlUtils.java

...ta_bundles/src/test/java/com/android/asllib/AllTests.java

...bundles/src/test/java/com/android/asllib/AslgenTests.java

...ava/com/android/asllib/marshallable/DataCategoryTest.java

.../java/com/android/asllib/marshallable/DataLabelsTest.java

...android/asllib/marshallable/SystemAppSafetyLabelTest.java

...ib/androidsafetylabel/hr/with-system-app-safety-label.xml

...ib/androidsafetylabel/od/with-system-app-safety-label.xml

...oid/asllib/datalabels/hr/data-category-actions-in-app.xml

...id/asllib/datalabels/hr/data-category-app-performance.xml

.../com/android/asllib/datalabels/hr/data-category-audio.xml

...m/android/asllib/datalabels/hr/data-category-calendar.xml

...m/android/asllib/datalabels/hr/data-category-contacts.xml