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

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

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