Merge "Add CREATE_VIRTUAL_DEVICE permission to Shell"