am 587488e0: am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev

* commit '587488e027c41394dc6a1f2248c4dbe8d3530b69':
  Update time when turning on screen, in addition to waking up