Merge "Spatializer: Fix usb headset" am: 68043b022a am: 37efbf919d am: f43b3274f0

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

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