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

Change-Id: Ic65d4e88fba91a096a6c87e9f73a9179481b1266