Merge "Make MediaButtonReceiver MediaBrowserServiceCompat aware" into mnc-ub-dev