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

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



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