Merge "MediaBrowserCompat: Make Patination API work on API 21-23" into nyc-dev