Merge "should_flash_in_userspace signature change" into main am: ac758f2c...

Merge "should_flash_in_userspace signature change" into main am: ac758f2c am: 12c7d42a am: 952e351d

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



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