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

Change-Id: I7f49088695ebd548d6cc67adcf222808ebecbbba