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: Iec73de951c44463d72f9af3b236644c04c6de689