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

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

Change-Id: Ia4f2ceeaa6930f62ae2dd431b80e93b9854d7fee