Merge "Revert^2 "Workaround Clang hangs indefinitely"" into main am: 9c904707ef am: c322dc4976

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

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