Merge "IMapper 5 - the Stable C approach" am: 4346ad0f75

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

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