Merge "VolumeShaperTest: Use AudioManager to get new session id" into pi-dev