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

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

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