Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: c8af272fb6 am: f2a1790db8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I266071322bc21ed4cd60ee33ea8b9b76ca2347cb