Merge "Add unit test for service validation for TvRemoteProvideWatcher." into rvc-dev am: b1acbedf am: 09d54464 Change-Id: Idff3a504d8b7fbcf15c7d8a7db7224735b5abbbe