Merge "Fix device name string on output switcher chip" into tm-qpr-dev am: cd1952c8

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



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