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

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