Merge "Don't crash from null ServiceState in cdma" into oc-mr1-dev
am: 88aa3d0f3e

Change-Id: I1bccabe56e1b7d497d6d74356adfbce46d24c860