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 am: 7ea44bb8

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



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