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

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

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