Merge "snapuserd: Remove legacy xor code." am: 65796039 am: b8a12d8d am:...

Merge "snapuserd: Remove legacy xor code." am: 65796039 am: b8a12d8d am: d5ce39bd am: 18b1d6b4

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



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