Merge "MediaBrowserCompat: Support pagination on L and M devices" into mnc-ub-dev