Merge "Revert "Revert "Fix NPE which occurs when MediaBrowserService.onLoadItem gives null""" into nyc-support-25.3-dev
am: 9e4553a0fe

Change-Id: I6af5e8f39d2d1344c17e8817c441f7cf5e4aa82d