[automerger skipped] Merge "AudioSystem: Fix hdmi name typo" into tm-qpr-dev...

[automerger skipped] Merge "AudioSystem: Fix hdmi name typo" into tm-qpr-dev am: bca24335 am: 60fe7b36 -s ours

am skip reason: Merged-In I4e2c14f49d96f2bde98b3274233f0dd2083134bb with SHA-1 799bb3e9 is already in history

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



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