SignalStrength: fix build

Change-Id: Id8a61b8e10bc7dc2ac32bac2ab2da8e78fcfc18a
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	telephony/java/android/telephony/SignalStrength.java

	modified:   telephony/java/android/telephony/SignalStrength.java