Merge "stablec mapper VINTF entry" am: f131f46272 am: edd3404d9f am: 2e6b110638

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

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