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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12039762

Change-Id: I17ec9b30c65660b4dfd600eee26add542eee640e