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

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

Change-Id: I1110c02b5944d58503bef8e959a42e49c5d7f164