Merge "Move Compat specific MediaBrowserCompat logic to ImplBase class" into mnc-ub-dev