Merge "libdm: dm-user target creation takes an additional argument" am: ba0b4bb900

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

Change-Id: I1df8aa37b063a64cb870abbb28043b334af19d5f