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

Change-Id: If33bf20e6985f19116ebaf480ad660d6778d6163