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

Change-Id: Ie5148e813239afe6bc7949b8b2e55a6952886497