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

Change-Id: I900eb7024f7c909c9217248888e42da2be229253