Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am:...
Merge "Fix unit test for TVRemoteProviderWatcherTest.java." into rvc-dev am: bbf2a294 am: c1a28624 am: 45e6ff97 am: 5b446516
Change-Id: I128fc6af73b1dafceb57ed571c1c7fc8eb9088ee