Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am: bbf2a29472 am: c1a2862434 am: 4126d21145 am: e3f3670b17 am: d0a73e5be2

Change-Id: I8b6d9e73de783c7a496f0349f90912b82361ead2