Merge "Don't assert while a callback is registered" am: 6a022ad1c4 am: d5e4905caa am: 8a673bc15e am: d1a8d70d09

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

Change-Id: I2bc54b5fb4340d7a6cbbbf1f7a05dda7e868852e