Merge "init: move `MarkServicesUpdate` later" into main am: e90d93ab6e am: ae91cd0dd6 am: 83a2197c80

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2680615

Change-Id: If68a393c7f8e165d5692a0d3f9f569ff6729ebab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>