Add back increasing ring feature (2/3).

Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be
Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-12.0