Merge "Revert^2 "Add SPEAKER_CLEANUP system usage"" into main am: 4b4e1eecdc

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

Change-Id: I06abf2a722f55c6fc7e172162f8511c4b08f5115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/aidl/android/media/audio/common/AudioUsage.aidl b/media/aidl/android/media/audio/common/AudioUsage.aidl
index 34a7185..c81806c 100644
--- a/media/aidl/android/media/audio/common/AudioUsage.aidl
+++ b/media/aidl/android/media/audio/common/AudioUsage.aidl
@@ -138,4 +138,9 @@
      * Usage value to use when the usage is an announcement.
      */
     ANNOUNCEMENT = 1003,
+    /**
+     * Usage value to use when the usage is to clean up the speaker
+     * transducers and free them of deposits of dust or water
+     */
+    SPEAKER_CLEANUP = 1004,
 }
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
index 7c30cd3..3074b9d 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
@@ -58,4 +58,5 @@
   SAFETY = 1001,
   VEHICLE_STATUS = 1002,
   ANNOUNCEMENT = 1003,
+  SPEAKER_CLEANUP = 1004,
 }