[automerger skipped] Merge "AudioSystem: Fix hdmi name typo" am: a9739b79...

[automerger skipped] Merge "AudioSystem: Fix hdmi name typo" am: a9739b79 am: e5fbf262 am: a9ffc452 am: 23b68532 -s ours

am skip reason: Merged-In I4e2c14f49d96f2bde98b3274233f0dd2083134bb with SHA-1 9c31ca9b is already in history

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



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