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

Change-Id: I0abefe0e3bcf5246b454ece637007ce7fa6f83e3