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

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

Change-Id: Ia1cd0ac9eb42d2f1740d53a64b8c907bb4ec7b65