[automerger skipped] Merge "SpatializerHelper: Fix device name translation"...

[automerger skipped] Merge "SpatializerHelper: Fix device name translation" am: eac48858 am: e83594d4 am: ec17fb1c am: 2b83861f -s ours am: f7f7310e -s ours

am skip reason: Merged-In Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34 with SHA-1 5392e89f is already in history

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



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