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

Change-Id: Ic80c7b69ee87230327d8a9a59005727253831704