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 am: bc884e3a
Change-Id: If57567a9dea0a9f1f1ab929eb26e52cebf1f699e