Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0 am: f1cec5bb49 am: 8dd3756132 am: 9aa0ab03fd

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

Change-Id: Iffa89cf72325cae6649145d37d6700d087972c7e