Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am:...

Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e4 am: 40f1fc93 am: a7c1fe87

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

Change-Id: I96b53b131d522d5df8b65910e379b6f4f1c10b1d