Revert "Finalize artifacts for extension SDK 7"

Revert submission 22648972-finalize-7

Reason for revert: missing SDK extension cl (?)

Reverted changes: /q/submissionid:22648972-finalize-7

Change-Id: I78a35b1db8519ee84c6537ad6a0a998df287ad43
diff --git a/7/Android.bp.auto b/7/Android.bp.auto
deleted file mode 100644
index 6f4372a..0000000
--- a/7/Android.bp.auto
+++ /dev/null
@@ -1,131 +0,0 @@
-// This is auto-generated. DO NOT EDIT.
-
-// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
-// to support coexistence.
-blueprint_package_includes {
-    match_all: ["com.android.mainline"]
-}
-
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-prebuilt_bootclasspath_fragment {
-    name: "com.android.configinfrastructure-bootclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
-    },
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.configinfrastructure"],
-    licenses: ["configinfrastructure-sdk_Android-Apache-2.0"],
-    contents: ["framework-configinfrastructure"],
-    fragments: [
-        {
-            apex: "com.android.art",
-            module: "art-bootclasspath-fragment",
-        },
-    ],
-    hidden_api: {
-        annotation_flags: "hiddenapi/annotation-flags.csv",
-        metadata: "hiddenapi/metadata.csv",
-        index: "hiddenapi/index.csv",
-        signature_patterns: "hiddenapi/signature-patterns.csv",
-        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
-        filtered_flags: "hiddenapi/filtered-flags.csv",
-    },
-}
-
-java_sdk_library_import {
-    name: "framework-configinfrastructure",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
-    },
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.configinfrastructure"],
-    licenses: ["configinfrastructure-sdk_Android-Apache-2.0"],
-    shared_library: false,
-    permitted_packages: ["android.provider"],
-    public: {
-        jars: ["sdk_library/public/framework-configinfrastructure-stubs.jar"],
-        stub_srcs: ["sdk_library/public/framework-configinfrastructure.srcjar"],
-        current_api: "sdk_library/public/framework-configinfrastructure.txt",
-        removed_api: "sdk_library/public/framework-configinfrastructure-removed.txt",
-        annotations: "sdk_library/public/framework-configinfrastructure_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["sdk_library/system/framework-configinfrastructure-stubs.jar"],
-        stub_srcs: ["sdk_library/system/framework-configinfrastructure.srcjar"],
-        current_api: "sdk_library/system/framework-configinfrastructure.txt",
-        removed_api: "sdk_library/system/framework-configinfrastructure-removed.txt",
-        annotations: "sdk_library/system/framework-configinfrastructure_annotations.zip",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["sdk_library/module-lib/framework-configinfrastructure-stubs.jar"],
-        stub_srcs: ["sdk_library/module-lib/framework-configinfrastructure.srcjar"],
-        current_api: "sdk_library/module-lib/framework-configinfrastructure.txt",
-        removed_api: "sdk_library/module-lib/framework-configinfrastructure-removed.txt",
-        annotations: "sdk_library/module-lib/framework-configinfrastructure_annotations.zip",
-        sdk_version: "module_current",
-    },
-}
-
-java_sdk_library_import {
-    name: "service-configinfrastructure",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
-    },
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.configinfrastructure"],
-    licenses: ["configinfrastructure-sdk_Android-Apache-2.0"],
-    shared_library: false,
-    permitted_packages: [
-        "android.provider",
-        "com.android.server.deviceconfig",
-    ],
-    public: {
-        jars: ["sdk_library/public/service-configinfrastructure-stubs.jar"],
-        stub_srcs: ["sdk_library/public/service-configinfrastructure.srcjar"],
-        current_api: "sdk_library/public/service-configinfrastructure.txt",
-        removed_api: "sdk_library/public/service-configinfrastructure-removed.txt",
-        annotations: "sdk_library/public/service-configinfrastructure_annotations.zip",
-        sdk_version: "module_current",
-    },
-    system_server: {
-        jars: ["sdk_library/system-server/service-configinfrastructure-stubs.jar"],
-        stub_srcs: ["sdk_library/system-server/service-configinfrastructure.srcjar"],
-        current_api: "sdk_library/system-server/service-configinfrastructure.txt",
-        removed_api: "sdk_library/system-server/service-configinfrastructure-removed.txt",
-        annotations: "sdk_library/system-server/service-configinfrastructure_annotations.zip",
-        sdk_version: "system_server_current",
-    },
-}
-
-license {
-    name: "configinfrastructure-sdk_Android-Apache-2.0",
-    visibility: ["//visibility:private"],
-    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-prebuilt_systemserverclasspath_fragment {
-    name: "com.android.configinfrastructure-systemserverclasspath-fragment",
-    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
-    },
-    visibility: ["//visibility:public"],
-    apex_available: ["com.android.configinfrastructure"],
-    licenses: ["configinfrastructure-sdk_Android-Apache-2.0"],
-    contents: ["service-configinfrastructure"],
-}
diff --git a/7/hiddenapi/annotation-flags.csv b/7/hiddenapi/annotation-flags.csv
deleted file mode 100644
index e69de29..0000000
--- a/7/hiddenapi/annotation-flags.csv
+++ /dev/null
diff --git a/7/hiddenapi/filtered-flags.csv b/7/hiddenapi/filtered-flags.csv
deleted file mode 100644
index 9881271..0000000
--- a/7/hiddenapi/filtered-flags.csv
+++ /dev/null
@@ -1,118 +0,0 @@
-Landroid/provider/DeviceConfig$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$1;->onChange(ZLandroid/net/Uri;)V,public-api,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$BadConfigException;-><init>()V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$MonitorCallback;->onDeviceConfigAccess(Ljava/lang/String;Ljava/lang/String;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$MonitorCallback;->onNamespaceUpdate(Ljava/lang/String;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$OnPropertiesChangedListener;->onPropertiesChanged(Landroid/provider/DeviceConfig$Properties;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;-><init>(Ljava/lang/String;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->build()Landroid/provider/DeviceConfig$Properties;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setBoolean(Ljava/lang/String;Z)Landroid/provider/DeviceConfig$Properties$Builder;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setFloat(Ljava/lang/String;F)Landroid/provider/DeviceConfig$Properties$Builder;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setInt(Ljava/lang/String;I)Landroid/provider/DeviceConfig$Properties$Builder;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setLong(Ljava/lang/String;J)Landroid/provider/DeviceConfig$Properties$Builder;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setString(Ljava/lang/String;Ljava/lang/String;)Landroid/provider/DeviceConfig$Properties$Builder;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getBoolean(Ljava/lang/String;Z)Z,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getFloat(Ljava/lang/String;F)F,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getInt(Ljava/lang/String;I)I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getKeyset()Ljava/util/Set;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getLong(Ljava/lang/String;J)J,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getNamespace()Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACCESSIBILITY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACTIVITY_MANAGER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ADSERVICES:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ANDROID:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APPSEARCH:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_COMPAT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_COMPAT_OVERRIDES:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_HIBERNATION:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ATTENTION_MANAGER_SERVICE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AUTOFILL:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AUTO_PIN_CONFIRMATION:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BACKUP_AND_RESTORE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BATTERY_SAVER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BIOMETRICS:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BLOBSTORE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BLUETOOTH:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CAMERA_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CAPTIVEPORTALLOGIN:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CELLULAR_SECURITY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CLIPBOARD:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONNECTIVITY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONSTRAIN_DISPLAY_APIS:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONTENT_CAPTURE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CREDENTIAL:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_DEX_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_DISPLAY_MANAGER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_EDGETPU_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_GAME_DRIVER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_HDMI_CONTROL:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_HEALTH_FITNESS:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INPUT_METHOD_MANAGER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INPUT_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INTELLIGENCE_ATTENTION:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_JOB_SCHEDULER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_LMKD_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_LOCATION:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_MEDIA:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_MEDIA_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NEARBY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NETD_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NNAPI_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ON_DEVICE_PERSONALIZATION:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_OTA:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PACKAGE_MANAGER_SERVICE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PERMISSIONS:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PRIVACY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PROFCOLLECT_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_REBOOT_READINESS:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_REMOTE_AUTH:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ROLLBACK:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ROLLBACK_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SCHEDULER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SDK_SANDBOX:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SELECTION_TOOLBAR:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_JAVA:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_JAVA_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STORAGE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STORAGE_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SWCODEC_NATIVE:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SYSTEMUI:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SYSTEM_TIME:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TELEPHONY:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TETHERING:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TEXTCLASSIFIER:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_UWB:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_WEARABLE_SENSING:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT:Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_NONE:I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_PERSISTENT:I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_UNTIL_REBOOT:I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->addOnPropertiesChangedListener(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/provider/DeviceConfig$OnPropertiesChangedListener;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->clearMonitorCallback(Landroid/content/ContentResolver;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->deleteProperty(Ljava/lang/String;Ljava/lang/String;)Z,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getAdbWritableFlags()Ljava/util/Set;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getBoolean(Ljava/lang/String;Ljava/lang/String;Z)Z,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getFloat(Ljava/lang/String;Ljava/lang/String;F)F,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getInt(Ljava/lang/String;Ljava/lang/String;I)I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getLong(Ljava/lang/String;Ljava/lang/String;J)J,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getProperties(Ljava/lang/String;[Ljava/lang/String;)Landroid/provider/DeviceConfig$Properties;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getPublicNamespaces()Ljava/util/List;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getString(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->getSyncDisabledMode()I,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->removeOnPropertiesChangedListener(Landroid/provider/DeviceConfig$OnPropertiesChangedListener;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->resetToDefaults(ILjava/lang/String;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->setMonitorCallback(Landroid/content/ContentResolver;Ljava/util/concurrent/Executor;Landroid/provider/DeviceConfig$MonitorCallback;)V,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->setProperties(Landroid/provider/DeviceConfig$Properties;)Z,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->setProperty(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Z,sdk,system-api,test-api
-Landroid/provider/DeviceConfig;->setSyncDisabledMode(I)V,sdk,system-api,test-api
-Landroid/provider/UpdatableDeviceConfigServiceReadiness;->shouldStartUpdatableService()Z,sdk,system-api,test-api
diff --git a/7/hiddenapi/filtered-stub-flags.csv b/7/hiddenapi/filtered-stub-flags.csv
deleted file mode 100644
index 34691f2..0000000
--- a/7/hiddenapi/filtered-stub-flags.csv
+++ /dev/null
@@ -1,118 +0,0 @@
-Landroid/provider/DeviceConfig$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/provider/DeviceConfig$1;->onChange(ZLandroid/net/Uri;)V,public-api,system-api,test-api
-Landroid/provider/DeviceConfig$BadConfigException;-><init>()V,system-api,test-api
-Landroid/provider/DeviceConfig$MonitorCallback;->onDeviceConfigAccess(Ljava/lang/String;Ljava/lang/String;)V,system-api,test-api
-Landroid/provider/DeviceConfig$MonitorCallback;->onNamespaceUpdate(Ljava/lang/String;)V,system-api,test-api
-Landroid/provider/DeviceConfig$OnPropertiesChangedListener;->onPropertiesChanged(Landroid/provider/DeviceConfig$Properties;)V,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;-><init>(Ljava/lang/String;)V,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->build()Landroid/provider/DeviceConfig$Properties;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setBoolean(Ljava/lang/String;Z)Landroid/provider/DeviceConfig$Properties$Builder;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setFloat(Ljava/lang/String;F)Landroid/provider/DeviceConfig$Properties$Builder;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setInt(Ljava/lang/String;I)Landroid/provider/DeviceConfig$Properties$Builder;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setLong(Ljava/lang/String;J)Landroid/provider/DeviceConfig$Properties$Builder;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties$Builder;->setString(Ljava/lang/String;Ljava/lang/String;)Landroid/provider/DeviceConfig$Properties$Builder;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getBoolean(Ljava/lang/String;Z)Z,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getFloat(Ljava/lang/String;F)F,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getInt(Ljava/lang/String;I)I,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getKeyset()Ljava/util/Set;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getLong(Ljava/lang/String;J)J,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getNamespace()Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig$Properties;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACCESSIBILITY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACTIVITY_MANAGER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ADSERVICES:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ANDROID:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APPSEARCH:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_COMPAT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_COMPAT_OVERRIDES:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_APP_HIBERNATION:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ATTENTION_MANAGER_SERVICE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AUTOFILL:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_AUTO_PIN_CONFIRMATION:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BACKUP_AND_RESTORE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BATTERY_SAVER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BIOMETRICS:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BLOBSTORE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_BLUETOOTH:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CAMERA_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CAPTIVEPORTALLOGIN:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CELLULAR_SECURITY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CLIPBOARD:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONNECTIVITY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONSTRAIN_DISPLAY_APIS:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CONTENT_CAPTURE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_CREDENTIAL:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_DEX_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_DISPLAY_MANAGER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_EDGETPU_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_GAME_DRIVER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_HDMI_CONTROL:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_HEALTH_FITNESS:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INPUT_METHOD_MANAGER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INPUT_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_INTELLIGENCE_ATTENTION:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_JOB_SCHEDULER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_LMKD_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_LOCATION:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_MEDIA:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_MEDIA_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NEARBY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NETD_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_NNAPI_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ON_DEVICE_PERSONALIZATION:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_OTA:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PACKAGE_MANAGER_SERVICE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PERMISSIONS:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PRIVACY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_PROFCOLLECT_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_REBOOT_READINESS:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_REMOTE_AUTH:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ROLLBACK:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_ROLLBACK_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_RUNTIME_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SCHEDULER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SDK_SANDBOX:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SELECTION_TOOLBAR:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_JAVA:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_JAVA_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STATSD_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STORAGE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_STORAGE_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SWCODEC_NATIVE:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SYSTEMUI:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_SYSTEM_TIME:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TELEPHONY:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TETHERING:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_TEXTCLASSIFIER:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_UWB:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_WEARABLE_SENSING:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT:Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_NONE:I,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_PERSISTENT:I,system-api,test-api
-Landroid/provider/DeviceConfig;->SYNC_DISABLED_MODE_UNTIL_REBOOT:I,system-api,test-api
-Landroid/provider/DeviceConfig;->addOnPropertiesChangedListener(Ljava/lang/String;Ljava/util/concurrent/Executor;Landroid/provider/DeviceConfig$OnPropertiesChangedListener;)V,system-api,test-api
-Landroid/provider/DeviceConfig;->clearMonitorCallback(Landroid/content/ContentResolver;)V,system-api,test-api
-Landroid/provider/DeviceConfig;->deleteProperty(Ljava/lang/String;Ljava/lang/String;)Z,system-api,test-api
-Landroid/provider/DeviceConfig;->getAdbWritableFlags()Ljava/util/Set;,system-api,test-api
-Landroid/provider/DeviceConfig;->getBoolean(Ljava/lang/String;Ljava/lang/String;Z)Z,system-api,test-api
-Landroid/provider/DeviceConfig;->getFloat(Ljava/lang/String;Ljava/lang/String;F)F,system-api,test-api
-Landroid/provider/DeviceConfig;->getInt(Ljava/lang/String;Ljava/lang/String;I)I,system-api,test-api
-Landroid/provider/DeviceConfig;->getLong(Ljava/lang/String;Ljava/lang/String;J)J,system-api,test-api
-Landroid/provider/DeviceConfig;->getProperties(Ljava/lang/String;[Ljava/lang/String;)Landroid/provider/DeviceConfig$Properties;,system-api,test-api
-Landroid/provider/DeviceConfig;->getProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->getPublicNamespaces()Ljava/util/List;,system-api,test-api
-Landroid/provider/DeviceConfig;->getString(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;,system-api,test-api
-Landroid/provider/DeviceConfig;->getSyncDisabledMode()I,system-api,test-api
-Landroid/provider/DeviceConfig;->removeOnPropertiesChangedListener(Landroid/provider/DeviceConfig$OnPropertiesChangedListener;)V,system-api,test-api
-Landroid/provider/DeviceConfig;->resetToDefaults(ILjava/lang/String;)V,system-api,test-api
-Landroid/provider/DeviceConfig;->setMonitorCallback(Landroid/content/ContentResolver;Ljava/util/concurrent/Executor;Landroid/provider/DeviceConfig$MonitorCallback;)V,system-api,test-api
-Landroid/provider/DeviceConfig;->setProperties(Landroid/provider/DeviceConfig$Properties;)Z,system-api,test-api
-Landroid/provider/DeviceConfig;->setProperty(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Z,system-api,test-api
-Landroid/provider/DeviceConfig;->setSyncDisabledMode(I)V,system-api,test-api
-Landroid/provider/UpdatableDeviceConfigServiceReadiness;->shouldStartUpdatableService()Z,system-api,test-api
diff --git a/7/hiddenapi/index.csv b/7/hiddenapi/index.csv
deleted file mode 100644
index 8b13789..0000000
--- a/7/hiddenapi/index.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/7/hiddenapi/metadata.csv b/7/hiddenapi/metadata.csv
deleted file mode 100644
index 8b13789..0000000
--- a/7/hiddenapi/metadata.csv
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/7/hiddenapi/signature-patterns.csv b/7/hiddenapi/signature-patterns.csv
deleted file mode 100644
index aa2d0f2..0000000
--- a/7/hiddenapi/signature-patterns.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-android/provider/DeviceConfig
-android/provider/DeviceConfigShellCommandHandler
-android/provider/UpdatableDeviceConfigServiceReadiness
-android/provider/WritableFlags
diff --git a/7/licenses/build/soong/licenses/LICENSE b/7/licenses/build/soong/licenses/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/7/licenses/build/soong/licenses/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/7/sdk_library/module-lib/framework-configinfrastructure-removed.txt b/7/sdk_library/module-lib/framework-configinfrastructure-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/module-lib/framework-configinfrastructure-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/module-lib/framework-configinfrastructure-stubs.jar b/7/sdk_library/module-lib/framework-configinfrastructure-stubs.jar
deleted file mode 100644
index 5287baf..0000000
--- a/7/sdk_library/module-lib/framework-configinfrastructure-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/module-lib/framework-configinfrastructure.srcjar b/7/sdk_library/module-lib/framework-configinfrastructure.srcjar
deleted file mode 100644
index 87783fc..0000000
--- a/7/sdk_library/module-lib/framework-configinfrastructure.srcjar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/module-lib/framework-configinfrastructure.txt b/7/sdk_library/module-lib/framework-configinfrastructure.txt
deleted file mode 100644
index 739f954..0000000
--- a/7/sdk_library/module-lib/framework-configinfrastructure.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-// Signature format: 2.0
-package android.provider {
-
-  public final class DeviceConfig {
-    field public static final String NAMESPACE_ACTIVITY_MANAGER_COMPONENT_ALIAS = "activity_manager_ca";
-    field public static final String NAMESPACE_ALARM_MANAGER = "alarm_manager";
-    field public static final String NAMESPACE_APP_CLONING = "app_cloning";
-    field public static final String NAMESPACE_APP_STANDBY = "app_standby";
-    field public static final String NAMESPACE_ARC_APP_COMPAT = "arc_app_compat";
-    field public static final String NAMESPACE_BATTERY_STATS = "battery_stats";
-    field public static final String NAMESPACE_CONFIGURATION = "configuration";
-    field public static final String NAMESPACE_CONNECTIVITY_THERMAL_POWER_MANAGER = "connectivity_thermal_power_manager";
-    field public static final String NAMESPACE_CONTACTS_PROVIDER = "contacts_provider";
-    field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";
-    field public static final String NAMESPACE_DEVICE_POLICY_MANAGER = "device_policy_manager";
-    field public static final String NAMESPACE_GAME_OVERLAY = "game_overlay";
-    field public static final String NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS = "intelligence_content_suggestions";
-    field public static final String NAMESPACE_INTERACTION_JANK_MONITOR = "interaction_jank_monitor";
-    field public static final String NAMESPACE_LATENCY_TRACKER = "latency_tracker";
-    field public static final String NAMESPACE_MEMORY_SAFETY_NATIVE = "memory_safety_native";
-    field public static final String NAMESPACE_MEMORY_SAFETY_NATIVE_BOOT = "memory_safety_native_boot";
-    field public static final String NAMESPACE_MGLRU_NATIVE = "mglru_native";
-    field public static final String NAMESPACE_REMOTE_KEY_PROVISIONING_NATIVE = "remote_key_provisioning_native";
-    field public static final String NAMESPACE_ROTATION_RESOLVER = "rotation_resolver";
-    field public static final String NAMESPACE_SETTINGS_STATS = "settings_stats";
-    field public static final String NAMESPACE_SETTINGS_UI = "settings_ui";
-    field public static final String NAMESPACE_TARE = "tare";
-    field public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE = "vendor_system_native";
-    field public static final String NAMESPACE_VENDOR_SYSTEM_NATIVE_BOOT = "vendor_system_native_boot";
-    field public static final String NAMESPACE_VIRTUALIZATION_FRAMEWORK_NATIVE = "virtualization_framework_native";
-    field public static final String NAMESPACE_VOICE_INTERACTION = "voice_interaction";
-    field public static final String NAMESPACE_WEAR = "wear";
-    field public static final String NAMESPACE_WIDGET = "widget";
-    field public static final String NAMESPACE_WINDOW_MANAGER = "window_manager";
-  }
-
-  public static class DeviceConfig.Properties {
-    ctor public DeviceConfig.Properties(@NonNull String, @Nullable java.util.Map<java.lang.String,java.lang.String>);
-  }
-
-  public final class DeviceConfigShellCommandHandler {
-    method public static int handleShellCommand(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.ParcelFileDescriptor, @NonNull android.os.ParcelFileDescriptor, @NonNull String[]);
-  }
-
-}
-
diff --git a/7/sdk_library/module-lib/framework-configinfrastructure_annotations.zip b/7/sdk_library/module-lib/framework-configinfrastructure_annotations.zip
deleted file mode 100644
index fbd5abf..0000000
--- a/7/sdk_library/module-lib/framework-configinfrastructure_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/framework-configinfrastructure-removed.txt b/7/sdk_library/public/framework-configinfrastructure-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/public/framework-configinfrastructure-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/public/framework-configinfrastructure-stubs.jar b/7/sdk_library/public/framework-configinfrastructure-stubs.jar
deleted file mode 100644
index b62b671..0000000
--- a/7/sdk_library/public/framework-configinfrastructure-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/framework-configinfrastructure.srcjar b/7/sdk_library/public/framework-configinfrastructure.srcjar
deleted file mode 100644
index b62b671..0000000
--- a/7/sdk_library/public/framework-configinfrastructure.srcjar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/framework-configinfrastructure.txt b/7/sdk_library/public/framework-configinfrastructure.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/public/framework-configinfrastructure.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/public/framework-configinfrastructure_annotations.zip b/7/sdk_library/public/framework-configinfrastructure_annotations.zip
deleted file mode 100644
index 15cb0ec..0000000
--- a/7/sdk_library/public/framework-configinfrastructure_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/service-configinfrastructure-removed.txt b/7/sdk_library/public/service-configinfrastructure-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/public/service-configinfrastructure-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/public/service-configinfrastructure-stubs.jar b/7/sdk_library/public/service-configinfrastructure-stubs.jar
deleted file mode 100644
index b62b671..0000000
--- a/7/sdk_library/public/service-configinfrastructure-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/service-configinfrastructure.srcjar b/7/sdk_library/public/service-configinfrastructure.srcjar
deleted file mode 100644
index b62b671..0000000
--- a/7/sdk_library/public/service-configinfrastructure.srcjar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/public/service-configinfrastructure.txt b/7/sdk_library/public/service-configinfrastructure.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/public/service-configinfrastructure.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/public/service-configinfrastructure_annotations.zip b/7/sdk_library/public/service-configinfrastructure_annotations.zip
deleted file mode 100644
index 15cb0ec..0000000
--- a/7/sdk_library/public/service-configinfrastructure_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system-server/service-configinfrastructure-removed.txt b/7/sdk_library/system-server/service-configinfrastructure-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/system-server/service-configinfrastructure-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/system-server/service-configinfrastructure-stubs.jar b/7/sdk_library/system-server/service-configinfrastructure-stubs.jar
deleted file mode 100644
index 31c06a7..0000000
--- a/7/sdk_library/system-server/service-configinfrastructure-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system-server/service-configinfrastructure.srcjar b/7/sdk_library/system-server/service-configinfrastructure.srcjar
deleted file mode 100644
index 0102fd8..0000000
--- a/7/sdk_library/system-server/service-configinfrastructure.srcjar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system-server/service-configinfrastructure.txt b/7/sdk_library/system-server/service-configinfrastructure.txt
deleted file mode 100644
index 722ace1..0000000
--- a/7/sdk_library/system-server/service-configinfrastructure.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Signature format: 2.0
-package com.android.server.deviceconfig {
-
-  public class DeviceConfigInit {
-  }
-
-  public static class DeviceConfigInit.Lifecycle extends com.android.server.SystemService {
-    ctor public DeviceConfigInit.Lifecycle(@NonNull android.content.Context);
-  }
-
-}
-
diff --git a/7/sdk_library/system-server/service-configinfrastructure_annotations.zip b/7/sdk_library/system-server/service-configinfrastructure_annotations.zip
deleted file mode 100644
index 15cb0ec..0000000
--- a/7/sdk_library/system-server/service-configinfrastructure_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system/framework-configinfrastructure-removed.txt b/7/sdk_library/system/framework-configinfrastructure-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/7/sdk_library/system/framework-configinfrastructure-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/7/sdk_library/system/framework-configinfrastructure-stubs.jar b/7/sdk_library/system/framework-configinfrastructure-stubs.jar
deleted file mode 100644
index 81cce4c..0000000
--- a/7/sdk_library/system/framework-configinfrastructure-stubs.jar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system/framework-configinfrastructure.srcjar b/7/sdk_library/system/framework-configinfrastructure.srcjar
deleted file mode 100644
index 7e785cb..0000000
--- a/7/sdk_library/system/framework-configinfrastructure.srcjar
+++ /dev/null
Binary files differ
diff --git a/7/sdk_library/system/framework-configinfrastructure.txt b/7/sdk_library/system/framework-configinfrastructure.txt
deleted file mode 100644
index cfe7cf7..0000000
--- a/7/sdk_library/system/framework-configinfrastructure.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-// Signature format: 2.0
-package android.provider {
-
-  public final class DeviceConfig {
-    method public static void addOnPropertiesChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertiesChangedListener);
-    method @RequiresPermission(android.Manifest.permission.MONITOR_DEVICE_CONFIG_ACCESS) public static void clearMonitorCallback(@NonNull android.content.ContentResolver);
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static boolean deleteProperty(@NonNull String, @NonNull String);
-    method @NonNull public static java.util.Set<java.lang.String> getAdbWritableFlags();
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static boolean getBoolean(@NonNull String, @NonNull String, boolean);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(@NonNull String, @NonNull String, float);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(@NonNull String, @NonNull String, int);
-    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(@NonNull String, @NonNull String, long);
-    method @NonNull @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static android.provider.DeviceConfig.Properties getProperties(@NonNull String, @NonNull java.lang.String...);
-    method @Nullable @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(@NonNull String, @NonNull String);
-    method @NonNull public static java.util.List<java.lang.String> getPublicNamespaces();
-    method @Nullable @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(@NonNull String, @NonNull String, @Nullable String);
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG}) public static int getSyncDisabledMode();
-    method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener);
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static void resetToDefaults(int, @Nullable String);
-    method @RequiresPermission(android.Manifest.permission.MONITOR_DEVICE_CONFIG_ACCESS) public static void setMonitorCallback(@NonNull android.content.ContentResolver, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.MonitorCallback);
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static boolean setProperties(@NonNull android.provider.DeviceConfig.Properties) throws android.provider.DeviceConfig.BadConfigException;
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG}) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean);
-    method @RequiresPermission(anyOf={android.Manifest.permission.WRITE_DEVICE_CONFIG, android.Manifest.permission.READ_WRITE_SYNC_DISABLED_MODE_CONFIG}) public static void setSyncDisabledMode(int);
-    field public static final String NAMESPACE_ACCESSIBILITY = "accessibility";
-    field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager";
-    field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot";
-    field public static final String NAMESPACE_ADSERVICES = "adservices";
-    field public static final String NAMESPACE_AMBIENT_CONTEXT_MANAGER_SERVICE = "ambient_context_manager_service";
-    field public static final String NAMESPACE_ANDROID = "android";
-    field public static final String NAMESPACE_APPSEARCH = "appsearch";
-    field public static final String NAMESPACE_APP_COMPAT = "app_compat";
-    field public static final String NAMESPACE_APP_COMPAT_OVERRIDES = "app_compat_overrides";
-    field public static final String NAMESPACE_APP_HIBERNATION = "app_hibernation";
-    field public static final String NAMESPACE_ATTENTION_MANAGER_SERVICE = "attention_manager_service";
-    field public static final String NAMESPACE_AUTOFILL = "autofill";
-    field public static final String NAMESPACE_AUTO_PIN_CONFIRMATION = "auto_pin_confirmation";
-    field public static final String NAMESPACE_BACKUP_AND_RESTORE = "backup_and_restore";
-    field public static final String NAMESPACE_BATTERY_SAVER = "battery_saver";
-    field public static final String NAMESPACE_BIOMETRICS = "biometrics";
-    field public static final String NAMESPACE_BLOBSTORE = "blobstore";
-    field public static final String NAMESPACE_BLUETOOTH = "bluetooth";
-    field public static final String NAMESPACE_CAMERA_NATIVE = "camera_native";
-    field public static final String NAMESPACE_CAPTIVEPORTALLOGIN = "captive_portal_login";
-    field public static final String NAMESPACE_CELLULAR_SECURITY = "cellular_security";
-    field public static final String NAMESPACE_CLIPBOARD = "clipboard";
-    field public static final String NAMESPACE_CONNECTIVITY = "connectivity";
-    field public static final String NAMESPACE_CONSTRAIN_DISPLAY_APIS = "constrain_display_apis";
-    field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture";
-    field public static final String NAMESPACE_CREDENTIAL = "credential_manager";
-    field @Deprecated public static final String NAMESPACE_DEX_BOOT = "dex_boot";
-    field public static final String NAMESPACE_DISPLAY_MANAGER = "display_manager";
-    field public static final String NAMESPACE_EDGETPU_NATIVE = "edgetpu_native";
-    field public static final String NAMESPACE_GAME_DRIVER = "game_driver";
-    field public static final String NAMESPACE_HDMI_CONTROL = "hdmi_control";
-    field public static final String NAMESPACE_HEALTH_FITNESS = "health_fitness";
-    field public static final String NAMESPACE_INPUT_METHOD_MANAGER = "input_method_manager";
-    field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";
-    field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention";
-    field public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";
-    field public static final String NAMESPACE_LMKD_NATIVE = "lmkd_native";
-    field public static final String NAMESPACE_LOCATION = "location";
-    field public static final String NAMESPACE_MEDIA = "media";
-    field public static final String NAMESPACE_MEDIA_NATIVE = "media_native";
-    field public static final String NAMESPACE_NEARBY = "nearby";
-    field public static final String NAMESPACE_NETD_NATIVE = "netd_native";
-    field public static final String NAMESPACE_NNAPI_NATIVE = "nnapi_native";
-    field public static final String NAMESPACE_ON_DEVICE_PERSONALIZATION = "on_device_personalization";
-    field public static final String NAMESPACE_OTA = "ota";
-    field public static final String NAMESPACE_PACKAGE_MANAGER_SERVICE = "package_manager_service";
-    field public static final String NAMESPACE_PERMISSIONS = "permissions";
-    field public static final String NAMESPACE_PRIVACY = "privacy";
-    field public static final String NAMESPACE_PROFCOLLECT_NATIVE_BOOT = "profcollect_native_boot";
-    field public static final String NAMESPACE_REBOOT_READINESS = "reboot_readiness";
-    field public static final String NAMESPACE_REMOTE_AUTH = "remote_auth";
-    field public static final String NAMESPACE_ROLLBACK = "rollback";
-    field public static final String NAMESPACE_ROLLBACK_BOOT = "rollback_boot";
-    field public static final String NAMESPACE_RUNTIME = "runtime";
-    field public static final String NAMESPACE_RUNTIME_NATIVE = "runtime_native";
-    field public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot";
-    field public static final String NAMESPACE_SCHEDULER = "scheduler";
-    field public static final String NAMESPACE_SDK_SANDBOX = "sdk_sandbox";
-    field public static final String NAMESPACE_SELECTION_TOOLBAR = "selection_toolbar";
-    field public static final String NAMESPACE_STATSD_JAVA = "statsd_java";
-    field public static final String NAMESPACE_STATSD_JAVA_BOOT = "statsd_java_boot";
-    field public static final String NAMESPACE_STATSD_NATIVE = "statsd_native";
-    field public static final String NAMESPACE_STATSD_NATIVE_BOOT = "statsd_native_boot";
-    field @Deprecated public static final String NAMESPACE_STORAGE = "storage";
-    field public static final String NAMESPACE_STORAGE_NATIVE_BOOT = "storage_native_boot";
-    field public static final String NAMESPACE_SURFACE_FLINGER_NATIVE_BOOT = "surface_flinger_native_boot";
-    field public static final String NAMESPACE_SWCODEC_NATIVE = "swcodec_native";
-    field public static final String NAMESPACE_SYSTEMUI = "systemui";
-    field public static final String NAMESPACE_SYSTEM_TIME = "system_time";
-    field public static final String NAMESPACE_TELEPHONY = "telephony";
-    field public static final String NAMESPACE_TETHERING = "tethering";
-    field public static final String NAMESPACE_TEXTCLASSIFIER = "textclassifier";
-    field public static final String NAMESPACE_UWB = "uwb";
-    field public static final String NAMESPACE_WEARABLE_SENSING = "wearable_sensing";
-    field public static final String NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT = "window_manager_native_boot";
-    field public static final int SYNC_DISABLED_MODE_NONE = 0; // 0x0
-    field public static final int SYNC_DISABLED_MODE_PERSISTENT = 1; // 0x1
-    field public static final int SYNC_DISABLED_MODE_UNTIL_REBOOT = 2; // 0x2
-  }
-
-  public static class DeviceConfig.BadConfigException extends java.lang.Exception {
-    ctor public DeviceConfig.BadConfigException();
-  }
-
-  public static interface DeviceConfig.MonitorCallback {
-    method public void onDeviceConfigAccess(@NonNull String, @NonNull String);
-    method public void onNamespaceUpdate(@NonNull String);
-  }
-
-  public static interface DeviceConfig.OnPropertiesChangedListener {
-    method public void onPropertiesChanged(@NonNull android.provider.DeviceConfig.Properties);
-  }
-
-  public static class DeviceConfig.Properties {
-    method public boolean getBoolean(@NonNull String, boolean);
-    method public float getFloat(@NonNull String, float);
-    method public int getInt(@NonNull String, int);
-    method @NonNull public java.util.Set<java.lang.String> getKeyset();
-    method public long getLong(@NonNull String, long);
-    method @NonNull public String getNamespace();
-    method @Nullable public String getString(@NonNull String, @Nullable String);
-  }
-
-  public static final class DeviceConfig.Properties.Builder {
-    ctor public DeviceConfig.Properties.Builder(@NonNull String);
-    method @NonNull public android.provider.DeviceConfig.Properties build();
-    method @NonNull public android.provider.DeviceConfig.Properties.Builder setBoolean(@NonNull String, boolean);
-    method @NonNull public android.provider.DeviceConfig.Properties.Builder setFloat(@NonNull String, float);
-    method @NonNull public android.provider.DeviceConfig.Properties.Builder setInt(@NonNull String, int);
-    method @NonNull public android.provider.DeviceConfig.Properties.Builder setLong(@NonNull String, long);
-    method @NonNull public android.provider.DeviceConfig.Properties.Builder setString(@NonNull String, @Nullable String);
-  }
-
-  public final class UpdatableDeviceConfigServiceReadiness {
-    method public static boolean shouldStartUpdatableService();
-  }
-
-}
-
diff --git a/7/sdk_library/system/framework-configinfrastructure_annotations.zip b/7/sdk_library/system/framework-configinfrastructure_annotations.zip
deleted file mode 100644
index fbd5abf..0000000
--- a/7/sdk_library/system/framework-configinfrastructure_annotations.zip
+++ /dev/null
Binary files differ
diff --git a/7/snapshot-creation-build-number.txt b/7/snapshot-creation-build-number.txt
deleted file mode 100644
index 4a65d43..0000000
--- a/7/snapshot-creation-build-number.txt
+++ /dev/null
@@ -1 +0,0 @@
-9942235
\ No newline at end of file