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

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

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