Merge "init: Add more diagnostics for b/223076262." into tm-dev am: 61b06cc8

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



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