Merge "Fix possible NPE in MediaSessionManager" into pi-dev
am: ed01dfba3e

Change-Id: I23892e1e97ef5dee8536164a14c8dd671696a0ef