Merge "Correcting Reboot Task Functionality" am: dddb5fa8 am: c457774d am:...

Merge "Correcting Reboot Task Functionality" am: dddb5fa8 am: c457774d am: ffe56578 am: 52e51d52

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



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