Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am: bbf2a294 am: c1a28624 Change-Id: I9846e1c5ffd22055b2156bd1c78eaca045c3cd16