Ability to hide alarm clock icon

Change-Id: I452280ecb272df890ffb403301b398950210cd0a
Merge branch 'cm' into HEAD