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