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

[automerger skipped] Merge "SpatializerHelper: Fix device name translation" into tm-qpr-dev am: 48f95ff5 am: 491c08b6 -s ours

am skip reason: Merged-In Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34 with SHA-1 5b373185 is already in history

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



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