[automerger skipped] Merge "AudioSystem: Fix hdmi name typo" am: a9739b791d am: e5fbf2627a am: a9ffc452b8 am: 23b68532c9 -s ours am: 160b9f445b -s ours

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

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

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