Merge changes from topic "upstream-audio-aidl-hal" am: 2468ff5608 am: 933e626ce7 am: 06bd2b0cff

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2190590

Change-Id: Iad145642c1ace36419a546bca435168a726cce16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/Android.bp b/audio/aidl/Android.bp
index 1db2224..4927e83 100644
--- a/audio/aidl/Android.bp
+++ b/audio/aidl/Android.bp
@@ -78,7 +78,7 @@
     ],
     imports: [
         "android.hardware.audio.common-V1",
-        "android.media.audio.common.types",
+        "android.media.audio.common.types-V1",
     ],
     stability: "vintf",
     backend: {