Merge "MediaBrowserCompat: Fix NPE" into nyc-dev am: 2969ac23f1 am: 64a012aa7f
am: 1e1ea4588b

* commit '1e1ea4588b340fdb9cc2b1fe57c34740cd738caf':
  MediaBrowserCompat: Fix NPE

Change-Id: I5ac75248d57710c37a6c9f2a030f94558eb0741c