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

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

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