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

Change-Id: I35ae8460173e101a6cad9dc13f6b7a262762ffc6