Merge "Move snapuserd_test to general-tests" into main am: a989252bdd am: 702754a23e

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

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