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

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