Merge "Spatializer: Fix usb headset" into tm-qpr-dev am: 77e13131

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



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