Merge "MediaSessionService: Fix NPE" into pi-dev am: 2aac6195e6
am: b0f40861c9

Change-Id: I5f3ee69673f9fcf1752306b1d2c3c2f79a4330f3