[automerger skipped] Don't assert while a callback is registered am: 310d3ddef7 -s ours am: 7244044c38 -s ours

am skip reason: skip tag Change-Id I3a1f8fbf15c24e344fde8e5b44bb93681ef47d38 with SHA-1 93d11f50df is already in history

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

Change-Id: Iec309251e8342485e28bb503d0d80f51266b8a82