Merge "Fix Wthread-safety-reference-return warnings" into main am: 7aa8a0f9c6

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

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