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

Change-Id: Ic7f9bd39345a64bad372fd1431f21588f51186fc