Merge "Add unit test for service validation for TvRemoteProvideWatcher." into...
Merge "Add unit test for service validation for TvRemoteProvideWatcher." into rvc-dev am: b1acbedf am: 432f5759 am: 81e393a4
Change-Id: I61e34219384f506919baf23eef282f2de3e64c6b