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

Change-Id: Id8420b5e2e6c72df98e76d4aa987400d7c6fb22a