Merge "Use the dm target for userdata" into main am: 389c03d4 am: 426361dc am: df304cf0

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



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