NetworkController: Hide signal strength icon when no SIM icon is shown

Change-Id: I5c4b43bba1469e14474d20a3627eafa597459e6e
Merge remote-tracking branch 'cyanogen/cm-12.0' into cm-12.0