Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: 525fc0dccb

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

Change-Id: I49e3a04f597eaecfa983ec0b62cb1a9ce8e3d2dc