Merge "Revert^2 "Add SPEAKER_CLEANUP system usage"" into main am: 112c9204ee

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

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