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

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

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

Change-Id: I40a9c9c367f8ae5ba27c2981c144502d856a3b4f