Merge "Add an exception for QTI SM8550" am: 26ceba03bc am: 8d95eb97d4

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

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