Merge "Use the dm target for userdata" into main am: 389c03d4 am: fa8900e7

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



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