Merge "Don't assert while a callback is registered" into android11-tests-dev am: 299f1aabcb

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

Change-Id: Ibfd0bedede499c3dd9946cbd50fb34820edcb8a4