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

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

Change-Id: I1635b058ca73c9c7d833c328e2caf59e715fcabe