[automerger skipped] Merge "Revert^2 "Add SPEAKER_CLEANUP system usage"" into...

[automerger skipped] Merge "Revert^2 "Add SPEAKER_CLEANUP system usage"" into main am: 112c9204 am: 39856c7b -s ours

am skip reason: Merged-In Ib62dd0b43f5bd8f04c901b8afbdc80b544149906 with SHA-1 2dd50bc4 is already in history

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



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