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

Change-Id: I5118601600aeac9ac464e5922524aa4f8261bc70