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

Change-Id: Ica96a383b9e7de417d26713a5c049a8d6a123de4