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

Change-Id: I6d8dbc95a01a7a0978433da77ed399d4a64d11e4