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

Change-Id: I293c98a5a27db0afb537f15ee8ebe7f0755bab1e