[conflict] Merge "Fix Wthread-safety-reference-return warnings" into main am:...

[conflict] Merge "Fix Wthread-safety-reference-return warnings" into main am: 7aa8a0f9 am: 693bc6a0

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



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