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

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

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