Fix return-stack-address warning am: 1a39569491 am: a8d7eb6729

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

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