Merge "Align default implementation with latest VSR." am: b1691e85d6

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

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