Merge "Revert "MediaBrowserCompat: Support pagination on N devices"" into mnc-ub-dev