[automerger skipped] Merge "SpatializerHelper: Fix device compatibility with...

[automerger skipped] Merge "SpatializerHelper: Fix device compatibility with spatial audio" am: fe4b37a3 am: 7d35eaf6 am: ef3eccee am: 5fc8a5a5 -s ours

am skip reason: Merged-In I1918f8ec82e1d79416804a6ec47df7181b0d79eb with SHA-1 f9de59ae is already in history

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



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