[automerger skipped] Merge "Spatializer: Fix usb headset" am: 68043b02 am:...

[automerger skipped] Merge "Spatializer: Fix usb headset" am: 68043b02 am: 37efbf91 am: f43b3274 am: a436a0d1 -s ours

am skip reason: Merged-In I904a299556f1cccb9d8d69a23245e387f7a5d35e with SHA-1 03ce410c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2210617



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