Merge "MediaBrowserServiceCompat: Handle null results from the implementation" into nyc-support-24.1-dev