[3/3] Telephony: Increasing ringtone volume

Base: https://gerrit.omnirom.org/#/c/4881/
Settings: https://gerrit.omnirom.org/#/c/4885/

Change-Id: I510d615c0bb1ce971b2dd45832a329fd8d09005b

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