Merge "Use logical path to handle different dm target per boot" into main am: c322b825

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2825095



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