Merge "Fix segfault." am: b278ae0c1e am: 5446c9c172

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

Change-Id: I6502829205ede2de914b27e6c2c5c42916af2b39