Merge "Workaround Clang hangs indefinitely" into main am: 0309dddb6c

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

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