Merge "Fix build on clang-r522817" into main am: c63722a3

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



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