Update Cdma Subscription for MetroPcs

Change-Id: I8ec7df1e77338c1d78614138c84caa3f752dde8a
fix up C Spire

Change-Id: If21b0e2cc197723c87b6c180088eeadbd1f772a3