Merge "Fix ringer mode being unneededly changed by setting ringer mode volume to 0." into cm-10.1

Change-Id: I6ab9682c6c346f9d3596170aded74b9ad70637d9
Author: maniac103