Merge "MediaBrowserCompat: Fix NPE" into nyc-mr1-dev am: 5f23d1645c am: b93f3b76e9
am: 8398f1ab84

Change-Id: I676ab495ebcc72c81da347ba5cf4ba0a6fe4aac1