Merge "Revert "Backport MediaBrowser and MediaBrowserService"" into mnc-ub-dev