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

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

Change-Id: I10556bc784394008c8243b730bbf9ee90146bfbe