Merge "SignalStrength: Hotfix TD-SCDMA take 2" into cm-11.0

Change-Id: I41a97286f00e839934a03bbea97af1a7acdd18af