Merge "snapuserd: Refactor daemon/server." am: 8425f6e6e6

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

Change-Id: I4286b948eba40d76fb7af438c6312af910cbaafc