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

Change-Id: I9f65655e16583c607e4bdb0bcfca726532e7c7bf