Merge "Remove usage of SignalStrength.getCdmaLevel() API"