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

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

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