Snap for 9050763 from 807d8a2e56ee46105ebde8d89e99c3cca3851f21 to mainline-mediaprovider-release Change-Id: Ia6401b3836362332d30b5423e7de6c7b05b67e09

diff --git a/Android.bp b/Android.bp
index aa0f42d..a6cf966 100644
--- a/Android.bp
+++ b/Android.bp

@@ -397,6 +397,7 @@
     jarjar_rules: ":NetworkStackJarJarRules",
     use_embedded_native_libs: true,
     optimize: {
+        ignore_warnings: false,
         proguard_flags_files: ["proguard.flags"],
     },
 }

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 038caad..d92badd 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp

@@ -34,7 +34,7 @@
         java: {
             apex_available: [
                 "//apex_available:platform",
-                "com.android.bluetooth",
+                "com.android.btservices",
                 "com.android.wifi",
                 "com.android.tethering",
             ],
@@ -110,7 +110,7 @@
         java: {
             apex_available: [
                 "//apex_available:platform",
-                "com.android.bluetooth",
+                "com.android.btservices",
                 "com.android.wifi",
                 "com.android.tethering",
             ],
@@ -164,7 +164,7 @@
     visibility: ["//packages/modules/NetworkStack:__subpackages__"],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
         "com.android.tethering",
         "com.android.wifi",
     ],
@@ -208,7 +208,7 @@
     ],
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth",
+        "com.android.btservices",
         "com.android.tethering",
         "com.android.wifi",
     ],