Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am:...
Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am: bbf2a294 am: 1a3c623a am: 3a301dd8 am: ff202bab
Change-Id: I979ad2c7cccb2df8ef24326daf9340728daf036f