am 541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0

* commit '541f6cfba8d1beb240e841530a761a084e354f64':
  Add alarm volume to the list of volumes in the volume overlay.