[automerger skipped] Merge "Remove automatic addition of AC3, IEC61937 to HDMI...

[automerger skipped] Merge "Remove automatic addition of AC3, IEC61937 to HDMI outputs" am: faa9ae8a am: ba5607e5 am: 0dd61eca am: 7b8e9ea8 am: 333c728f -s ours

am skip reason: Merged-In I54d9a2c2f203db9fb462ef6d1206ce17043ab997 with SHA-1 83caee07 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1846934

Change-Id: Iac807f2b14aeeeaaa73fd74e21c5675123e116d2