Merge "Make snapuserd recovery_available." into main am: a22e44dead

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

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