telephony: Cleanup after QCRIL merge

Change-Id: I777818d9034593696bf96ad96048daa0011e9f80

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
systemui: Kill logspam

Change-Id: I79ed31c754861625f1294aab9ac62b980d743e8b
NetworkController: Hide signal strength icon when no SIM icon is shown

Change-Id: I5c4b43bba1469e14474d20a3627eafa597459e6e

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java