Merge "AudioPlaybackConfiguration: add audio session ID" into sc-dev