Fix signal strength indicator.

Some devices don't check the service indicator, but only the signal
indicator. Don't give the false impression that the network signal is ok
when we're actually out of service for those devices.

Change-Id: I2e24daf13593439cbc23254fb4539cd250dbae89
Merge "Fix signal strength indicator." into cm-11.0
Merge branch 'cm' into HEAD