Merge "Extend QC SPU waiver to VSR-S devices." am: 3258884207

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

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