Merge "Drop <name>I</name> from mapper HAL." am: d2bbda8b32 am: 116ddaf033 am: 81f4ddd0c5

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

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