am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1

* commit '252c64f9c3e2e357f8687e18d8a066cc1cdb8c15':
  Only use CDMA rssi for config_alwaysUseCdmaRssi.