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: 24a9789b am: fe2aea58

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



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