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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I462db0c54e6ec2a1bb6992973ae84f8143c45e7a