Merge "Revert "Remove non existent snapuserd.recovery package"" into main am: f3fa5d5b

Original change: https://android-review.googlesource.com/c/platform/build/+/3155414



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