Merge "Land CTS tests for MediaBrowser/Service to MediaBrowser/ServiceCompat"