Merge changes from topic "libsnapuserd_client" into main am: babf3a98 am:...

Merge changes from topic "libsnapuserd_client" into main am: babf3a98 am: ee91991f am: 9ba5b35e

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



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