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

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



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