Merge "Fix potential use-after-free bug in reboot" into rvc-dev am: 03ad58468b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I536a324182f70725a5fda0c36f7f9d4676fd49b9