Merge "RESTRICT AUTOMERGE: snapuserd: Run snapuserd threads in-process." am: 07f6f239 am: 29b74f73

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



Change-Id: I0513ea7b9757bbcb0973f14ffbc99107f18c4e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>