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

Change-Id: Ic1014b078e36de67a75f8b0cd6261ce74c45be90