Merge "Correcting Reboot Task Functionality" am: dddb5fa80b am: c457774df3 am: ffe565785b

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

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