Merge "Add unit test for service validation for TvRemoteProvideWatcher." into...
Merge "Add unit test for service validation for TvRemoteProvideWatcher." into rvc-dev am: b1acbedf am: 09d54464 am: 4c6520d4
Change-Id: I4b89da669ccbcc8462e6334c5a4c0d595db578c1