am 3d5b80cb: Merge "Low battery notification sound update, alarm sound update" into honeycomb

* commit '3d5b80cb18e904b2d97414c43276ca568af27f1c':
  Low battery notification sound update, alarm sound update