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

Change-Id: I8f59160ed812601282504ee5677537e9bf85e1c3