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

Change-Id: Ia47be383cbc07818a7a51f85bfba4a30aedd3a5a