Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev