Merge "libsnapshot:snapuserd: Fix memory leak" am: ef8d3c39b5 am: 1e88568d40

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

Change-Id: Ibaad94a42f6586a83fb38002ea3c03669744ce00