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

Change-Id: I163cfe733cfbc30aab78e4ce61f84cb4edfbebf1