Merge changes I0886baa4,I584f98f9

* changes:
  Sort legacyCorePlatformApiModules
  Remove SystemUI from legacyCorePlatformApiModules

java/legacy_core_platform_api_usage.go

@@ -22,7 +22,6 @@ import (
 var legacyCorePlatformApiModules = []string{
 	"AAECarSystemUI",
 	"AAECarSystemUI-tests",
-	"ArcSettings",
 	"ahat-test-dump",
 	"android.car",
 	"android.test.mock",
@@ -30,6 +29,7 @@ var legacyCorePlatformApiModules = []string{
 	"AoapTestDeviceApp",
 	"AoapTestHostApp",
 	"api-stubs-docs",
+	"ArcSettings",
 	"art_cts_jvmti_test_library",
 	"art-gtest-jars-MyClassNatives",
 	"BackupEncryption",
@@ -78,7 +78,7 @@ var legacyCorePlatformApiModules = []string{
 	"DownloadProvider",
 	"DownloadProviderTests",
 	"DownloadProviderUi",
-	"ds-car-docs", // for AAOS API documentation only
+	"ds-car-docs",
 	"DynamicSystemInstallationService",
 	"EmergencyInfo-lib",
 	"EthernetServiceTests",
@@ -91,11 +91,11 @@ var legacyCorePlatformApiModules = []string{
 	"FrameworkOverlayG6QU3",
 	"FrameworksCoreTests",
 	"FrameworksIkeTests",
+	"FrameworksMockingServicesTests",
 	"FrameworksNetCommonTests",
 	"FrameworksNetTests",
 	"FrameworksServicesRoboTests",
 	"FrameworksServicesTests",
-	"FrameworksMockingServicesTests",
 	"FrameworksUtilTests",
 	"GtsIncrementalInstallTestCases",
 	"GtsIncrementalInstallTriggerApp",
@@ -191,9 +191,6 @@ var legacyCorePlatformApiModules = []string{
 	"SimSettings",
 	"sl4a.Common",
 	"StatementService",
-	"SystemUI-core",
-	"SystemUISharedLib",
-	"SystemUI-tests",
 	"tcmiface",
 	"Telecom",
 	"TelecomUnitTests",