Merge "Add unit test for service validation for TvRemoteProvideWatcher." into rvc-dev