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

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

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