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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I895a5a170c60da26aacdbf869ea14b6d6db4dd67