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

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



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