Merge "Revert "vib example client on product"" am: e829d02013 am: 410b8675b4 am: 36e54cd096

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

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