Merge changes from topic "remove-ic-vsr-test" am: a0bb39cd9d am: 03de9e5d1b

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

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