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

Merge "Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e4 am: 40f1fc93" into rvc-d1-dev-plus-aosp am: f3a17176 am: f4232b0b

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

Change-Id: Iea08b077e3c78ad68edf8a1029abe8916f71c93c