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: 268a0718 am: 5b395564

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

Change-Id: I269e94f9ecd145f08c16e44b12e64682709a3aeb