[automerger skipped] Merge "init: Take wakelock on zygote restart" into...

[automerger skipped] Merge "init: Take wakelock on zygote restart" into tm-qpr-dev am: 8ea0c2e2 -s ours am: 0c474adc -s ours

am skip reason: Merged-In Id8cff6564ef05d8c22a8264c51dd313263cb6a9d with SHA-1 2255e8ed is already in history

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



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