[automerger skipped] Merge "IMapper 5 - the Stable C approach" am: 4346ad0f...

[automerger skipped] Merge "IMapper 5 - the Stable C approach" am: 4346ad0f am: 6c34656e am: 789a7a33 -s ours

am skip reason: Merged-In I910b27f388e3fb7261425dd4b2133885c05edd37 with SHA-1 48c546c7 is already in history

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



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