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

Change-Id: I039e3d32119426d92eb79dd40bd9babdcef99699