Merge \\\"MediaSession: Use mHandler for sending a pending intent\\\" am: fcae61308c am: b417585b29
am: e76561980e

Change-Id: I75e2b19c9851ccebe7cdb27829911cea1677b1b0