Merge "Fix sim pin on DSDS" into qt-r1-dev
am: 6050d6b626

Change-Id: I128d43cbd243f29a5a40d4d69db68f67619ac3d4