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

Change-Id: I38719f7f3c11d7ec7fb49b06491f070c789658f8