Be more robust when attempting to parse the subscription ID.

E.g. emergency calls have the ID 'E'.

Change-Id: I1669c3fe702883b05db9c02d42cc98a6c8f44b79
Merge branch 'cm-12.0' into mkl