Revert "NetworkController: Fix hiding signal strength icon when no SIM icon shown"

This reverts commit 7ca87c0c99bd80fdef29bc7ac5ae0283c0387177.
Revert "NetworkController: Hide signal strength icon when no SIM icon is shown"

This reverts commit 54453d1939d23b2fb10b49d4714b8afc76bdb835.
Revert "Squashed commit of the following:"

This reverts commit 56072e854776100a082fa397d36395e14450e477.

Conflicts:

	telephony/java/android/telephony/SignalStrength.java
	telephony/java/com/android/internal/telephony/ISms.aidl

Change-Id: I06aee40557340a6d47c1b93340fd1c708f34df5d