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

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

Change-Id: I62a9dd55b1c90b373fc8e9d7c30cd56537434ca8