Merge "Extend QC SPU waiver to VSR-S devices." am: 3258884207 am: f25e3b2bcb am: 2415be97e3 am: 74634c2db5

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

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