Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

current/Android.bp
current/snapshot-creation-build-number.txt
current/licenses/build/soong/licenses/LICENSE
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
current/sdk_library/module-lib/framework-adservices-removed.txt
current/sdk_library/module-lib/framework-adservices-stubs.jar
current/sdk_library/module-lib/framework-adservices.srcjar
current/sdk_library/module-lib/framework-adservices.txt
current/sdk_library/module-lib/framework-adservices_annotations.zip
current/sdk_library/module-lib/framework-sdksandbox-removed.txt
current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
current/sdk_library/module-lib/framework-sdksandbox.srcjar
current/sdk_library/module-lib/framework-sdksandbox.txt
current/sdk_library/module-lib/framework-sdksandbox_annotations.zip
current/sdk_library/system/framework-adservices-removed.txt
current/sdk_library/system/framework-adservices-stubs.jar
current/sdk_library/system/framework-adservices.srcjar
current/sdk_library/system/framework-adservices.txt
current/sdk_library/system/framework-adservices_annotations.zip
current/sdk_library/system/framework-sdksandbox-removed.txt
current/sdk_library/system/framework-sdksandbox-stubs.jar
current/sdk_library/system/framework-sdksandbox.srcjar
current/sdk_library/system/framework-sdksandbox.txt
current/sdk_library/system/framework-sdksandbox_annotations.zip
current/sdk_library/system-server/service-adservices-removed.txt
current/sdk_library/system-server/service-adservices-stubs.jar
current/sdk_library/system-server/service-adservices.srcjar
current/sdk_library/system-server/service-adservices.txt
current/sdk_library/system-server/service-adservices_annotations.zip
current/sdk_library/system-server/service-sdksandbox-removed.txt
current/sdk_library/system-server/service-sdksandbox-stubs.jar
current/sdk_library/system-server/service-sdksandbox.srcjar
current/sdk_library/system-server/service-sdksandbox.txt
current/sdk_library/system-server/service-sdksandbox_annotations.zip
current/sdk_library/public/framework-adservices-removed.txt
current/sdk_library/public/framework-adservices-stubs.jar
current/sdk_library/public/framework-adservices.srcjar
current/sdk_library/public/framework-adservices.txt
current/sdk_library/public/framework-adservices_annotations.zip
current/sdk_library/public/framework-sdksandbox-removed.txt
current/sdk_library/public/framework-sdksandbox-stubs.jar
current/sdk_library/public/framework-sdksandbox.srcjar
current/sdk_library/public/framework-sdksandbox.txt
current/sdk_library/public/framework-sdksandbox_annotations.zip
current/sdk_library/public/service-adservices-removed.txt
current/sdk_library/public/service-adservices-stubs.jar
current/sdk_library/public/service-adservices.srcjar
current/sdk_library/public/service-adservices.txt
current/sdk_library/public/service-adservices_annotations.zip
current/sdk_library/public/service-sdksandbox-removed.txt
current/sdk_library/public/service-sdksandbox-stubs.jar
current/sdk_library/public/service-sdksandbox.srcjar
current/sdk_library/public/service-sdksandbox.txt
current/sdk_library/public/service-sdksandbox_annotations.zip

Built here: ab/P66500611

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Change-Id: Ia0ffd9a2166f3c3880c49d3cfaa32615b0472591
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 8cede05..3264c2f 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "P66079541"
+    build_id: "P66500611"
     target: "mainline_modules_sdks-trunk-userdebug"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.adservices/sdk/adservices-module-sdk-current.zip"
   }
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index a42a87a..a2b601e 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -16,6 +16,7 @@
 Landroid/adservices/adid/AdId;->isLimitAdTrackingEnabled()Z,public-api,sdk,system-api,test-api
 Landroid/adservices/adid/AdId;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/adid/AdIdCompatibleManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/adid/AdIdManager;->get(Landroid/content/Context;)Landroid/adservices/adid/AdIdManager;,public-api,sdk,system-api,test-api
@@ -350,7 +351,8 @@
 Landroid/adservices/appsetid/AppSetId;->getId()Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/adservices/appsetid/AppSetId;->getScope()I,public-api,sdk,system-api,test-api
 Landroid/adservices/appsetid/AppSetId;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager;->get(Landroid/content/Context;)Landroid/adservices/appsetid/AppSetIdManager;,public-api,sdk,system-api,test-api
@@ -1077,6 +1079,10 @@
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException;-><init>(Ljava/lang/Throwable;Landroid/os/Bundle;)V,public-api,sdk,system-api,test-api
@@ -1168,8 +1174,10 @@
 Landroid/app/sdksandbox/SharedPreferencesUpdate;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/SharedPreferencesUpdate;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;->onActivityCreated(Landroid/app/Activity;)V,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;->onForegroundImportanceChanged(Z)V,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$LoadSdkReceiverProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$LoadSdkReceiverProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$SdkSandboxClientImportanceListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->SDK_SANDBOX_CONTROLLER_SERVICE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getAppOwnedSdkSandboxInterfaces()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getClientPackageName()Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -1177,7 +1185,9 @@
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getSandboxedSdks()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->loadSdk(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->registerSdkSandboxActivityHandler(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->registerSdkSandboxClientImportanceListener(Ljava/util/concurrent/Executor;Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;)V,public-api,sdk,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->unregisterSdkSandboxActivityHandler(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)V,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->unregisterSdkSandboxClientImportanceListener(Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;)V,public-api,sdk,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$AdServicesServiceConnection;->onBindingDied(Landroid/content/ComponentName;)V,public-api,sdk,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$AdServicesServiceConnection;->onNullBinding(Landroid/content/ComponentName;)V,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index b738725..f4af54a 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -15,6 +15,7 @@
 Landroid/adservices/adid/AdId;->isLimitAdTrackingEnabled()Z,public-api,system-api,test-api
 Landroid/adservices/adid/AdId;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/adid/AdIdCompatibleManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/adid/AdIdCompatibleManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/adid/AdIdManager;->get(Landroid/content/Context;)Landroid/adservices/adid/AdIdManager;,public-api,system-api,test-api
@@ -349,7 +350,8 @@
 Landroid/adservices/appsetid/AppSetId;->getId()Ljava/lang/String;,public-api,system-api,test-api
 Landroid/adservices/appsetid/AppSetId;->getScope()I,public-api,system-api,test-api
 Landroid/adservices/appsetid/AppSetId;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda0;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/appsetid/AppSetIdManager$$ExternalSyntheticLambda1;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/adservices/appsetid/AppSetIdManager;->get(Landroid/content/Context;)Landroid/adservices/appsetid/AppSetIdManager;,public-api,system-api,test-api
@@ -1076,6 +1078,10 @@
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/app/sdksandbox/ISharedPreferencesSyncCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/app/sdksandbox/IUnloadSdkCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/app/sdksandbox/LoadSdkException;-><init>(Ljava/lang/Throwable;Landroid/os/Bundle;)V,public-api,system-api,test-api
@@ -1167,8 +1173,10 @@
 Landroid/app/sdksandbox/SharedPreferencesUpdate;->describeContents()I,public-api,system-api,test-api
 Landroid/app/sdksandbox/SharedPreferencesUpdate;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;->onActivityCreated(Landroid/app/Activity;)V,public-api,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;->onForegroundImportanceChanged(Z)V,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$LoadSdkReceiverProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$LoadSdkReceiverProxy$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController$SdkSandboxClientImportanceListenerProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->SDK_SANDBOX_CONTROLLER_SERVICE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getAppOwnedSdkSandboxInterfaces()Ljava/util/List;,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getClientPackageName()Ljava/lang/String;,public-api,system-api,test-api
@@ -1176,7 +1184,9 @@
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->getSandboxedSdks()Ljava/util/List;,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->loadSdk(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->registerSdkSandboxActivityHandler(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->registerSdkSandboxClientImportanceListener(Ljava/util/concurrent/Executor;Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;)V,public-api,system-api,test-api
 Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->unregisterSdkSandboxActivityHandler(Landroid/app/sdksandbox/sdkprovider/SdkSandboxActivityHandler;)V,public-api,system-api,test-api
+Landroid/app/sdksandbox/sdkprovider/SdkSandboxController;->unregisterSdkSandboxClientImportanceListener(Landroid/app/sdksandbox/sdkprovider/SdkSandboxClientImportanceListener;)V,public-api,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$$ExternalSyntheticLambda0;->execute(Ljava/lang/Runnable;)V,core-platform-api,public-api,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$AdServicesServiceConnection;->onBindingDied(Landroid/content/ComponentName;)V,public-api,system-api,test-api
 Lcom/android/adservices/AndroidServiceBinder$AdServicesServiceConnection;->onNullBinding(Landroid/content/ComponentName;)V,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 1b5667d..d0baf08 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,13 +1,13 @@
 signature,file,startline,startcol,endline,endcol,properties
-Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,16,5,16,25,
-Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,22,5,22,25,
-Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,28,5,28,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,8,5,8,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,11,5,11,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,14,5,14,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,39,5,39,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,48,5,48,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,57,5,57,25,
-Lcom/android/sdksandbox/flags/Flags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,15,5,15,25,
-Lcom/android/sdksandbox/flags/Flags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,20,5,20,25,
-Lcom/android/sdksandbox/flags/Flags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,25,5,25,25,
+Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,17,5,17,25,
+Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,25,5,25,25,
+Lcom/android/sdksandbox/flags/FakeFeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FakeFeatureFlagsImpl.java,33,5,33,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,9,5,9,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,15,5,15,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,21,5,21,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,67,5,67,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,79,5,79,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,91,5,91,25,
+Lcom/android/sdksandbox/flags/Flags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,22,5,22,25,
+Lcom/android/sdksandbox/flags/Flags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,29,5,29,25,
+Lcom/android/sdksandbox/flags/Flags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,36,5,36,25,
diff --git a/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar b/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
index a0f7d97..acdd981 100644
--- a/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-sdksandbox.srcjar b/current/sdk_library/module-lib/framework-sdksandbox.srcjar
index 307e53d..56c1484 100644
--- a/current/sdk_library/module-lib/framework-sdksandbox.srcjar
+++ b/current/sdk_library/module-lib/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-adservices-stubs.jar b/current/sdk_library/public/framework-adservices-stubs.jar
index ab5c26d..9237e76 100644
--- a/current/sdk_library/public/framework-adservices-stubs.jar
+++ b/current/sdk_library/public/framework-adservices-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-adservices.srcjar b/current/sdk_library/public/framework-adservices.srcjar
index 30b7187..8a68e10 100644
--- a/current/sdk_library/public/framework-adservices.srcjar
+++ b/current/sdk_library/public/framework-adservices.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-adservices.txt b/current/sdk_library/public/framework-adservices.txt
index d4581c9..a81f122 100644
--- a/current/sdk_library/public/framework-adservices.txt
+++ b/current/sdk_library/public/framework-adservices.txt
@@ -590,11 +590,11 @@
 
 package android.adservices.topics {
 
-  @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) public final class EncryptedTopic {
-    ctor @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) public EncryptedTopic(@NonNull byte[], @NonNull String, @NonNull byte[]);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) @NonNull public byte[] getEncapsulatedKey();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) @NonNull public byte[] getEncryptedTopic();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) @NonNull public String getKeyIdentifier();
+  @FlaggedApi("topics_encryption_enabled") public final class EncryptedTopic {
+    ctor @FlaggedApi("topics_encryption_enabled") public EncryptedTopic(@NonNull byte[], @NonNull String, @NonNull byte[]);
+    method @FlaggedApi("topics_encryption_enabled") @NonNull public byte[] getEncapsulatedKey();
+    method @FlaggedApi("topics_encryption_enabled") @NonNull public byte[] getEncryptedTopic();
+    method @FlaggedApi("topics_encryption_enabled") @NonNull public String getKeyIdentifier();
   }
 
   public final class GetTopicsRequest {
@@ -610,13 +610,13 @@
   }
 
   public final class GetTopicsResponse {
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) @NonNull public java.util.List<android.adservices.topics.EncryptedTopic> getEncryptedTopics();
+    method @FlaggedApi("topics_encryption_enabled") @NonNull public java.util.List<android.adservices.topics.EncryptedTopic> getEncryptedTopics();
     method @NonNull public java.util.List<android.adservices.topics.Topic> getTopics();
   }
 
   public static final class GetTopicsResponse.Builder {
     ctor @Deprecated public GetTopicsResponse.Builder(@NonNull java.util.List<android.adservices.topics.Topic>);
-    ctor @FlaggedApi(android.adservices.FlagsConstants.KEY_TOPICS_ENCRYPTION_ENABLED) public GetTopicsResponse.Builder(@NonNull java.util.List<android.adservices.topics.Topic>, @NonNull java.util.List<android.adservices.topics.EncryptedTopic>);
+    ctor @FlaggedApi("topics_encryption_enabled") public GetTopicsResponse.Builder(@NonNull java.util.List<android.adservices.topics.Topic>, @NonNull java.util.List<android.adservices.topics.EncryptedTopic>);
     method @NonNull public android.adservices.topics.GetTopicsResponse build();
   }
 
diff --git a/current/sdk_library/public/framework-sdksandbox-stubs.jar b/current/sdk_library/public/framework-sdksandbox-stubs.jar
index c1ff4ac..0e18ee9 100644
--- a/current/sdk_library/public/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/public/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-sdksandbox.srcjar b/current/sdk_library/public/framework-sdksandbox.srcjar
index 65dcaf8..09df013 100644
--- a/current/sdk_library/public/framework-sdksandbox.srcjar
+++ b/current/sdk_library/public/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-sdksandbox.txt b/current/sdk_library/public/framework-sdksandbox.txt
index e409c4b..eb8bb95 100644
--- a/current/sdk_library/public/framework-sdksandbox.txt
+++ b/current/sdk_library/public/framework-sdksandbox.txt
@@ -20,12 +20,12 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.app.sdksandbox.LoadSdkException> CREATOR;
   }
 
-  public final class RequestSurfacePackageException extends java.lang.Exception {
-    ctor public RequestSurfacePackageException(int, @Nullable String);
-    ctor public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable);
-    ctor public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable, @NonNull android.os.Bundle);
-    method @NonNull public android.os.Bundle getExtraErrorInformation();
-    method public int getRequestSurfacePackageErrorCode();
+  @Deprecated public final class RequestSurfacePackageException extends java.lang.Exception {
+    ctor @Deprecated public RequestSurfacePackageException(int, @Nullable String);
+    ctor @Deprecated public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable);
+    ctor @Deprecated public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable, @NonNull android.os.Bundle);
+    method @Deprecated @NonNull public android.os.Bundle getExtraErrorInformation();
+    method @Deprecated public int getRequestSurfacePackageErrorCode();
   }
 
   public final class SandboxedSdk implements android.os.Parcelable {
@@ -42,7 +42,7 @@
     method public final void attachContext(@NonNull android.content.Context);
     method public void beforeUnloadSdk();
     method @Nullable public final android.content.Context getContext();
-    method @NonNull public abstract android.view.View getView(@NonNull android.content.Context, @NonNull android.os.Bundle, int, int);
+    method @Deprecated @NonNull public abstract android.view.View getView(@NonNull android.content.Context, @NonNull android.os.Bundle, int, int);
     method @NonNull public abstract android.app.sdksandbox.SandboxedSdk onLoadSdk(@NonNull android.os.Bundle) throws android.app.sdksandbox.LoadSdkException;
   }
 
@@ -57,15 +57,15 @@
     method public void registerAppOwnedSdkSandboxInterface(@NonNull android.app.sdksandbox.AppOwnedSdkSandboxInterface);
     method public void removeSdkSandboxProcessDeathCallback(@NonNull android.app.sdksandbox.SdkSandboxManager.SdkSandboxProcessDeathCallback);
     method public void removeSyncedSharedPreferencesKeys(@NonNull java.util.Set<java.lang.String>);
-    method public void requestSurfacePackage(@NonNull String, @NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.os.Bundle,android.app.sdksandbox.RequestSurfacePackageException>);
+    method @Deprecated public void requestSurfacePackage(@NonNull String, @NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.os.Bundle,android.app.sdksandbox.RequestSurfacePackageException>);
     method public void startSdkSandboxActivity(@NonNull android.app.Activity, @NonNull android.os.IBinder);
     method public void unloadSdk(@NonNull String);
     method public void unregisterAppOwnedSdkSandboxInterface(@NonNull String);
-    field public static final String EXTRA_DISPLAY_ID = "android.app.sdksandbox.extra.DISPLAY_ID";
-    field public static final String EXTRA_HEIGHT_IN_PIXELS = "android.app.sdksandbox.extra.HEIGHT_IN_PIXELS";
-    field public static final String EXTRA_HOST_TOKEN = "android.app.sdksandbox.extra.HOST_TOKEN";
-    field public static final String EXTRA_SURFACE_PACKAGE = "android.app.sdksandbox.extra.SURFACE_PACKAGE";
-    field public static final String EXTRA_WIDTH_IN_PIXELS = "android.app.sdksandbox.extra.WIDTH_IN_PIXELS";
+    field @Deprecated public static final String EXTRA_DISPLAY_ID = "android.app.sdksandbox.extra.DISPLAY_ID";
+    field @Deprecated public static final String EXTRA_HEIGHT_IN_PIXELS = "android.app.sdksandbox.extra.HEIGHT_IN_PIXELS";
+    field @Deprecated public static final String EXTRA_HOST_TOKEN = "android.app.sdksandbox.extra.HOST_TOKEN";
+    field @Deprecated public static final String EXTRA_SURFACE_PACKAGE = "android.app.sdksandbox.extra.SURFACE_PACKAGE";
+    field @Deprecated public static final String EXTRA_WIDTH_IN_PIXELS = "android.app.sdksandbox.extra.WIDTH_IN_PIXELS";
     field public static final int LOAD_SDK_ALREADY_LOADED = 101; // 0x65
     field public static final int LOAD_SDK_INTERNAL_ERROR = 500; // 0x1f4
     field public static final int LOAD_SDK_NOT_FOUND = 100; // 0x64
@@ -91,6 +91,10 @@
     method public void onActivityCreated(@NonNull android.app.Activity);
   }
 
+  @FlaggedApi(com.android.sdksandbox.flags.Flags.FLAG_SANDBOX_CLIENT_IMPORTANCE_LISTENER) public interface SdkSandboxClientImportanceListener {
+    method @FlaggedApi(com.android.sdksandbox.flags.Flags.FLAG_SANDBOX_CLIENT_IMPORTANCE_LISTENER) public void onForegroundImportanceChanged(boolean);
+  }
+
   public class SdkSandboxController {
     method @NonNull public java.util.List<android.app.sdksandbox.AppOwnedSdkSandboxInterface> getAppOwnedSdkSandboxInterfaces();
     method @NonNull public String getClientPackageName();
@@ -98,7 +102,9 @@
     method @NonNull public java.util.List<android.app.sdksandbox.SandboxedSdk> getSandboxedSdks();
     method public void loadSdk(@NonNull String, @NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.sdksandbox.SandboxedSdk,android.app.sdksandbox.LoadSdkException>);
     method @NonNull public android.os.IBinder registerSdkSandboxActivityHandler(@NonNull android.app.sdksandbox.sdkprovider.SdkSandboxActivityHandler);
+    method @FlaggedApi(com.android.sdksandbox.flags.Flags.FLAG_SANDBOX_CLIENT_IMPORTANCE_LISTENER) public void registerSdkSandboxClientImportanceListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.sdksandbox.sdkprovider.SdkSandboxClientImportanceListener);
     method @NonNull public void unregisterSdkSandboxActivityHandler(@NonNull android.app.sdksandbox.sdkprovider.SdkSandboxActivityHandler);
+    method @FlaggedApi(com.android.sdksandbox.flags.Flags.FLAG_SANDBOX_CLIENT_IMPORTANCE_LISTENER) public void unregisterSdkSandboxClientImportanceListener(@NonNull android.app.sdksandbox.sdkprovider.SdkSandboxClientImportanceListener);
     field public static final String SDK_SANDBOX_CONTROLLER_SERVICE = "sdk_sandbox_controller_service";
   }
 
diff --git a/current/sdk_library/system/framework-adservices.txt b/current/sdk_library/system/framework-adservices.txt
index a726333..fa1cddf 100644
--- a/current/sdk_library/system/framework-adservices.txt
+++ b/current/sdk_library/system/framework-adservices.txt
@@ -48,13 +48,13 @@
 
   public class AdServicesCommonManager {
     method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void enableAdServices(@NonNull android.adservices.common.AdServicesStates, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADSERVICES_API_ENABLED) @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void enableAdServices(@NonNull android.adservices.common.AdServicesStates, @NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
+    method @FlaggedApi("enable_adservices_api_enabled") @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void enableAdServices(@NonNull android.adservices.common.AdServicesStates, @NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
     method @NonNull public static android.adservices.common.AdServicesCommonManager get(@NonNull android.content.Context);
     method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE_COMPAT}) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ADSERVICES_ENABLEMENT_CHECK_ENABLED) @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE_COMPAT}) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
+    method @FlaggedApi("adservices_enablement_check_enabled") @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE_COMPAT}) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
     method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void setAdServicesEnabled(boolean, boolean);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID, android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID_COMPAT}) public void updateAdId(@NonNull android.adservices.common.UpdateAdIdRequest, @NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID, android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID_COMPAT}) public void updateAdId(@NonNull android.adservices.common.UpdateAdIdRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
+    method @FlaggedApi("ad_id_cache_enabled") @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID, android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID_COMPAT}) public void updateAdId(@NonNull android.adservices.common.UpdateAdIdRequest, @NonNull java.util.concurrent.Executor, @NonNull android.adservices.common.AdServicesOutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
+    method @FlaggedApi("ad_id_cache_enabled") @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID, android.adservices.common.AdServicesPermissions.UPDATE_PRIVILEGED_AD_ID_COMPAT}) public void updateAdId(@NonNull android.adservices.common.UpdateAdIdRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
   }
 
   public class AdServicesPermissions {
@@ -65,8 +65,8 @@
     field public static final String ACCESS_PRIVILEGED_APP_SET_ID = "android.permission.ACCESS_PRIVILEGED_APP_SET_ID";
     field public static final String MODIFY_ADSERVICES_STATE = "android.permission.MODIFY_ADSERVICES_STATE";
     field public static final String MODIFY_ADSERVICES_STATE_COMPAT = "android.permission.MODIFY_ADSERVICES_STATE_COMPAT";
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public static final String UPDATE_PRIVILEGED_AD_ID = "android.permission.UPDATE_PRIVILEGED_AD_ID";
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public static final String UPDATE_PRIVILEGED_AD_ID_COMPAT = "android.permission.UPDATE_PRIVILEGED_AD_ID_COMPAT";
+    field @FlaggedApi("ad_id_cache_enabled") public static final String UPDATE_PRIVILEGED_AD_ID = "android.permission.UPDATE_PRIVILEGED_AD_ID";
+    field @FlaggedApi("ad_id_cache_enabled") public static final String UPDATE_PRIVILEGED_AD_ID_COMPAT = "android.permission.UPDATE_PRIVILEGED_AD_ID_COMPAT";
   }
 
   public final class AdServicesStates implements android.os.Parcelable {
@@ -98,49 +98,49 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.EnableAdServicesResponse> CREATOR;
   }
 
-  @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public final class UpdateAdIdRequest implements android.os.Parcelable {
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public int describeContents();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @NonNull public String getAdId();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public boolean isLimitAdTrackingEnabled();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.UpdateAdIdRequest> CREATOR;
+  @FlaggedApi("ad_id_cache_enabled") public final class UpdateAdIdRequest implements android.os.Parcelable {
+    method @FlaggedApi("ad_id_cache_enabled") public int describeContents();
+    method @FlaggedApi("ad_id_cache_enabled") @NonNull public String getAdId();
+    method @FlaggedApi("ad_id_cache_enabled") public boolean isLimitAdTrackingEnabled();
+    method @FlaggedApi("ad_id_cache_enabled") public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @FlaggedApi("ad_id_cache_enabled") @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.UpdateAdIdRequest> CREATOR;
   }
 
-  @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public static final class UpdateAdIdRequest.Builder {
-    ctor @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) public UpdateAdIdRequest.Builder(@NonNull String);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @NonNull public android.adservices.common.UpdateAdIdRequest build();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_AD_ID_CACHE_ENABLED) @NonNull public android.adservices.common.UpdateAdIdRequest.Builder setLimitAdTrackingEnabled(boolean);
+  @FlaggedApi("ad_id_cache_enabled") public static final class UpdateAdIdRequest.Builder {
+    ctor @FlaggedApi("ad_id_cache_enabled") public UpdateAdIdRequest.Builder(@NonNull String);
+    method @FlaggedApi("ad_id_cache_enabled") @NonNull public android.adservices.common.UpdateAdIdRequest build();
+    method @FlaggedApi("ad_id_cache_enabled") @NonNull public android.adservices.common.UpdateAdIdRequest.Builder setLimitAdTrackingEnabled(boolean);
   }
 
 }
 
 package android.adservices.extdata {
 
-  @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public final class AdServicesExtDataParams implements android.os.Parcelable {
-    ctor @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public AdServicesExtDataParams(int, int, int, int, int, long);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int describeContents();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int getIsAdultAccount();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int getIsMeasurementConsented();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int getIsNotificationDisplayed();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int getIsU18Account();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public int getManualInteractionWithConsentStatus();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public long getMeasurementRollbackApexVersion();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) @NonNull public static final android.os.Parcelable.Creator<android.adservices.extdata.AdServicesExtDataParams> CREATOR;
+  @FlaggedApi("enable_adext_data_service_apis") public final class AdServicesExtDataParams implements android.os.Parcelable {
+    ctor @FlaggedApi("enable_adext_data_service_apis") public AdServicesExtDataParams(int, int, int, int, int, long);
+    method @FlaggedApi("enable_adext_data_service_apis") public int describeContents();
+    method @FlaggedApi("enable_adext_data_service_apis") public int getIsAdultAccount();
+    method @FlaggedApi("enable_adext_data_service_apis") public int getIsMeasurementConsented();
+    method @FlaggedApi("enable_adext_data_service_apis") public int getIsNotificationDisplayed();
+    method @FlaggedApi("enable_adext_data_service_apis") public int getIsU18Account();
+    method @FlaggedApi("enable_adext_data_service_apis") public int getManualInteractionWithConsentStatus();
+    method @FlaggedApi("enable_adext_data_service_apis") public long getMeasurementRollbackApexVersion();
+    method @FlaggedApi("enable_adext_data_service_apis") public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @FlaggedApi("enable_adext_data_service_apis") @NonNull public static final android.os.Parcelable.Creator<android.adservices.extdata.AdServicesExtDataParams> CREATOR;
   }
 
-  @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public abstract class AdServicesExtDataStorageService extends android.app.Service {
-    ctor @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public AdServicesExtDataStorageService();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) @NonNull public abstract android.adservices.extdata.AdServicesExtDataParams onGetAdServicesExtData();
-    method @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public abstract void onPutAdServicesExtData(@NonNull android.adservices.extdata.AdServicesExtDataParams, @NonNull int[]);
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_IS_ADULT_ACCOUNT = 3; // 0x3
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_IS_MEASUREMENT_CONSENTED = 1; // 0x1
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_IS_NOTIFICATION_DISPLAYED = 0; // 0x0
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_IS_U18_ACCOUNT = 2; // 0x2
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_MANUAL_INTERACTION_WITH_CONSENT_STATUS = 4; // 0x4
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final int FIELD_MEASUREMENT_ROLLBACK_APEX_VERSION = 5; // 0x5
-    field @FlaggedApi(android.adservices.FlagsConstants.KEY_ENABLE_ADEXT_DATA_SERVICE_APIS) public static final String SERVICE_INTERFACE = "android.adservices.extdata.AdServicesExtDataStorageService";
+  @FlaggedApi("enable_adext_data_service_apis") public abstract class AdServicesExtDataStorageService extends android.app.Service {
+    ctor @FlaggedApi("enable_adext_data_service_apis") public AdServicesExtDataStorageService();
+    method @FlaggedApi("enable_adext_data_service_apis") @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
+    method @FlaggedApi("enable_adext_data_service_apis") @NonNull public abstract android.adservices.extdata.AdServicesExtDataParams onGetAdServicesExtData();
+    method @FlaggedApi("enable_adext_data_service_apis") public abstract void onPutAdServicesExtData(@NonNull android.adservices.extdata.AdServicesExtDataParams, @NonNull int[]);
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_IS_ADULT_ACCOUNT = 3; // 0x3
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_IS_MEASUREMENT_CONSENTED = 1; // 0x1
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_IS_NOTIFICATION_DISPLAYED = 0; // 0x0
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_IS_U18_ACCOUNT = 2; // 0x2
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_MANUAL_INTERACTION_WITH_CONSENT_STATUS = 4; // 0x4
+    field @FlaggedApi("enable_adext_data_service_apis") public static final int FIELD_MEASUREMENT_ROLLBACK_APEX_VERSION = 5; // 0x5
+    field @FlaggedApi("enable_adext_data_service_apis") public static final String SERVICE_INTERFACE = "android.adservices.extdata.AdServicesExtDataStorageService";
   }
 
 }
diff --git a/current/sdk_library/system/framework-sdksandbox-stubs.jar b/current/sdk_library/system/framework-sdksandbox-stubs.jar
index f05a2aa..a3c53ff 100644
--- a/current/sdk_library/system/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/system/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-sdksandbox.srcjar b/current/sdk_library/system/framework-sdksandbox.srcjar
index ae05169..65722ad 100644
--- a/current/sdk_library/system/framework-sdksandbox.srcjar
+++ b/current/sdk_library/system/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 982d393..82fe0c1 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-P66079541
\ No newline at end of file
+P66500611
\ No newline at end of file