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

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

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