Merge "Remove userspace reboot" into main am: d374d6870c

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

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