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

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

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