Merge "Allow MediaBrowser be connect to MediaBrowserServiceCompat" into mnc-ub-dev