Merge "Add option to configure audio session ids for VirtualDevice"