Merge "Allow MediaBrowserCompat be connect to MediaBrowserService" into mnc-ub-dev