Merge "init: Take wakelock on zygote restart" am: 93e02c6d am: bd0a2a22 am: fb849b73

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



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