Allow overriding GPRS as EDGE

Change-Id: I8585e8feee242e290a2f22b1799280ffd8c86022

Conflicts:

	src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java