Merge "Remove userspace reboot" into main am: d374d6870c am: 89147d4188

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3213980

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