Merge "should_flash_in_userspace signature change" into main am: ac758f2ccc am: 12c7d42a55 am: 952e351dbb am: 556f96f4a7

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

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