Merge "easy vib. instance name" am: 92f223a9 am: 89c4d48e am: b34c0ed7

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



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