Merge "easy vib. instance name" am: 92f223a9cc

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

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