Merge "snapuserd: Fix bool/int return value mismatches." into main am: bb235ebf48

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

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