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