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

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

Change-Id: I3a9f2f5fcf7cf59152f5283cdaee9b3412d7752c