Merge "Add resume from hibernation in first stage init" into main am: adcba868 am: 6c2ae188

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



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