Merge "Fix a bug that would access uninitialized data." into tm-dev am: 7ab075cb83 am: ea65f64c75

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

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