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

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

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