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

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

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