Merge "AVRCP: Check mMediaSessionManager is not null before handling callback" am: a26ad65f23
am: 1469840cb2

Change-Id: I2d959bc914cb5c9b286103727f9c2568cf987b36