Merge "Fix return-stack-address warning" am: 550964e8 am: d6b935c1

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



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