Merge "Remove usage of SignalStrength.getCdmaLevel() API"
am: da41e66438

Change-Id: Icac1de72123845d5d601830e96fee6704fb281f6