Merge "Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c am: 40f1fc932c" into rvc-d1-dev-plus-aosp