[automerger skipped] Merge "AudioService: Fix SpatializerHelper asserts" into...

[automerger skipped] Merge "AudioService: Fix SpatializerHelper asserts" into tm-d1-dev-plus-aosp am: 5f404448 -s ours am: 1e0b00f8 -s ours

am skip reason: Merged-In I2ca01b76d701e7f5db7ba08d159bba843b145e4e with SHA-1 2e76f6b6 is already in history

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



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