[2/2] services/Telephony: Combine LTE & 2G/3G Tiles

This combines both network tiles into one tile.
2G -> 3G -> 2G3G -> LTE

Linked commit: frameworks/base

Change-Id: Ib8c463e9bd9b9d70462e3a7544c54d239a1c3254

Conflicts:
	src/com/android/phone/PhoneInterfaceManager.java