Merge "Verify op_ is not a nullptr" am: 2d63764c34 am: a8b92e548f am: 3284c9aec4

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

Change-Id: Ieef79940fb6165e66e6a70bd9527b6d3669cb4ee