Merge changes from topic "remove-ic-vsr-test" am: a0bb39cd am: 03de9e5d...

Merge changes from topic "remove-ic-vsr-test" am: a0bb39cd am: 03de9e5d am: eccba5a0 am: 2843cae1

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



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