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

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

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