Clean up after QCRIL merge

Change-Id: Ib95cb02066c9b5a362c3c2d425b2cb6e1fdd2d5b

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