Merge "Correcting Reboot Task Functionality" am: dddb5fa80b

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

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