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

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

Change-Id: Ic2bf59f35edfe120faf90caba1cc1816a51ad4c1