MediaBrowserCompat: Fix NPE am: 6caeb660f9
am: 52626a1dea

Change-Id: I89bc4013a44e3bb57ecfdb6b100be7e6e664d67f