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

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