Merge "libsnapshot: Terminate snapuserd daemon after merge completion" am:...

Merge "libsnapshot: Terminate snapuserd daemon after merge completion" am: 91ff0285 am: 2b04882f am: 76c7ab46 am: f63e02b1

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

Change-Id: Icced204822198eaa1ae485ea454e754b2db6aaa4