Merge "Remove 'x' policy for non-default DSDS SIM" into qt-qpr1-dev