Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: 525fc0dccb am: 4851cbef3e am: 1475f07281

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

Change-Id: Icb52ad9d3f7a63fd08a0ab3353b57669c2144721