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 am: fa4ac530

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



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