Merge "Remove automatic addition of AC3, IEC61937 to HDMI outputs" am: faa9ae8a95 am: ba5607e569

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

Change-Id: I345ac5e868a408de355b7b3c3679f01990df3f2b