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

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

Change-Id: I202504be0cb134605adc4d6eeebebaa86602cd43