Merge "libsnapshot:snapuserd: Transitions for snapuserd" am: e19df50b75 am: 47014a7514

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

Change-Id: I1981065fea3e432baf7ccca1ef63475fc894afb4