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

Change-Id: I2b4719d6f50533f62af22d55fb870802ead7c554