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

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



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