Merge "Merge "Merge "Fix TvRecordingClient api issues" am: cce2ca95 am:...

Merge "Merge "Merge "Fix TvRecordingClient api issues" am: cce2ca95 am: f7cbbae9" into rvc-dev-plus-aosp am: 14bd7ccb am: f9061f95 am: 4276a002" into rvc-dev am: 52bcedf5

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

Change-Id: Ica863ccf33a17820106ae13be1661162563686d6