Merge "fix spatializer conversion" into main am: bb80b1cb am: 9d59417e am: 23d97293

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



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