Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am: bbf2a29472 am: 1a3c623a2e am: 3a301dd886 am: ff202bab22

Change-Id: I979ad2c7cccb2df8ef24326daf9340728daf036f