am b90559a6: Merge "Fix 5906830: Update the clock earlier when lock screen comes back from suspend."

* commit 'b90559a6066965debe173e2ea94bbffb87ad2d6a':
  Fix 5906830: Update the clock earlier when lock screen comes back from suspend.