Snap for 12829911 from 0d3bcf19356635560d1ad3c54d2fce4843a1ffdc to 25Q2-release

Change-Id: I31dce77fbb3559ef2c0dfe7a1339263ee9427989
diff --git a/Android.bp b/Android.bp
index 06959a0..5b4eefa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,7 +98,6 @@
         // - no testing story/infra for deprecation schedule
         "//apex_available:platform",
         "com.android.neuralnetworks",
-        "test_com.android.neuralnetworks",
         "com.android.btservices",
         "com.android.media",
         "com.android.media.swcodec",
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 063cd8e..43654d2 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -38,7 +38,6 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.neuralnetworks",
-        "test_com.android.neuralnetworks",
         "com.android.media",
         "com.android.media.swcodec",
     ],