Merge "should_flash_in_userspace signature change" into main am: ac758f2ccc

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

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