Merge "Fix return-stack-address warning" am: 550964e884

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

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