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

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

Change-Id: If6b5fe800955b602be362f269d6350014e384c6a