Merge "Make MediaSessionManager#RESULT_MEDIA_KEY_*HANDLED as @SystemApi"