Fix return-stack-address warning am: 1a395694 am: a8d7eb67 am: 952c2c7c...

Fix return-stack-address warning am: 1a395694 am: a8d7eb67 am: 952c2c7c am: 19e5846d am: e4e19946

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



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