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

Change-Id: Ie73d6d54e5c9db635a70440c68b4e7bfb87db3c5