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

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

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