Merge "Prevent error message on svc power reboot" into main am: ae6753571e

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

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