MediaBrowserCompat: Fix NPE
am: 6caeb660f9

Change-Id: I83d5b83fc6c5d31673ee9d10debbcf8ec793e00f