Merge "Use new API to load mapper" into main am: 6a5da15033

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2960862

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