Merge "Use target device mapper given mapper target" into main am: 191af795...

Merge "Use target device mapper given mapper target" into main am: 191af795 am: 0792fa73 am: 64b2ecc8

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



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