Merge "Add unit test for service validation for TvRemoteProvideWatcher." into rvc-dev am: b1acbedf am: 432f5759 Change-Id: Iea4d206a46a561795cb405607db7dbdf5e8e1a76