Merge "Fix segfault." am: b278ae0c1e

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

Change-Id: Iefeda021f623ae7bfd7ee26173a9bb5af8827a2b