Merge "Move Session apis to android.media.session"