MediaBrowserCompat: Fix NPE am: 6caeb660f9
am: 6675f1817f

Change-Id: I2e27418973403bcc78af2c063299f76634803212