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

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

Change-Id: Ie7917a12ee4ff2ef44c2e118d669d930a69060eb
Signed-off-by: Automerger Merge Worker <[email protected]>