Merge "Integrate snapuserd with dm-user ABI changes." am: e9cb85def4

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

Change-Id: I8a380496653e88c38bf71af360983e11d79c9472