Merge "Fix sim pin on DSDS" am: 268b4a3ad4
am: fb8ca75270

Change-Id: Ic24cab8c9c8588c7d950bce3b7f8371a31047eb8