Merge "snapuserd: Remove legacy xor code." am: 657960396c am: b8a12d8dbd

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

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