Merge "snapuserd: remove implicit assumption about dm-user in BufferSink" into...

Merge "snapuserd: remove implicit assumption about dm-user in BufferSink" into main am: 2007e0cc am: 8ee39b4f

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



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