Merge "Revert "snapuserd: Add unit test for test merge code path"" am: 3a1ddf5555

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

Change-Id: I571e31fd2b7bb9102e4bc2877cde906e6460c662