Merge "Fix the "Alarm volume" icon is displayed incorrectly" am: e0ba81110a
am: 657abc315d

Change-Id: I295d50e9513775dddb2aea3686275264d7e0f12c