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

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

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



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