Merge "Fix segfault." am: b278ae0c1e am: 5446c9c172 am: b659a47fb2 am: 32253ad14f

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

Change-Id: Ieba91ea3f0a673c97f4ede18ad4ae2b3057f84fb