[automerger skipped] Merge "Align default implementation with latest VSR." am:...

[automerger skipped] Merge "Align default implementation with latest VSR." am: b1691e85 am: f85b1d5e am: c67f5149 -s ours am: 7d3ea22b -s ours

am skip reason: Merged-In I56f6f847f4c47775db6350b8a3fcd7ee9c9cdf17 with SHA-1 5851c3aa is already in history

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



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