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

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

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



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