am 777163e0: Merge "Updated emergency icon on lockscreen" into ics-factoryrom

* commit '777163e0466bda76d64809b5fd6a1a688de67099':
  Updated emergency icon on lockscreen