[automerger skipped] Merge "Revert^2 "audiopolicy: speaker cleanup...

[automerger skipped] Merge "Revert^2 "audiopolicy: speaker cleanup AudioAttributes usage"" into main am: 65ec1924 am: 6d0e94c4 -s ours

am skip reason: Merged-In I7abdcb5f5d82b558cac07114f2c202f7bd32f25c with SHA-1 2dbb1a99 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3456216



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