Merge "Remove android.media.* AIDL libs from VNDK" into tm-dev-plus-aosp am: b8e3ad6eae

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869513

Change-Id: Ibbd3c468e944b88277df5d299940e67c864f13f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/Android.bp

@@ -110,9 +110,6 @@ aidl_interface {
             ],
         },
         ndk: {
-            vndk: {
-                enabled: true,
-            },
             min_sdk_version: "29",
             apex_available: [
                 "//apex_available:platform",
@@ -164,11 +161,6 @@ aidl_interface {
         java: {
             sdk_version: "module_current",
         },
-        ndk: {
-            vndk: {
-                enabled: true,
-            },
-        },
     },
     imports: [
         "android.media.audio.common.types",