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

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

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