rild: Unbreak multi-SIM socket name

Change-Id: Icae742c42c45726105d1a9e07a26bc4d10cc82bf
Merge remote-tracking branch 'cm/cm-11.0' into HEAD