Merge "init: delay 'user root' test to W+" into main am: 0d8a598b40 am: 848cb39248

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

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