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

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

Change-Id: I47124be32f498066fbba206c0274f852e4782abf