Merge "Revert^3 "Workaround Clang hangs indefinitely"" into main am: 2ce9bb9d71

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

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