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

Merge "Extend QC SPU waiver to VSR-S devices." am: 32588842 am: f25e3b2b am: 2415be97 am: 74634c2d am: c655c8ac

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



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