Merge "snapuserd: Remove ambiguous BufferSink in workers." into main am:...

Merge "snapuserd: Remove ambiguous BufferSink in workers." into main am: 0c0745e6 am: 84e0aebf am: 04aa376a am: 435bd5bc am: 30b3f043

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



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