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 am: 20ffa3fa

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

Change-Id: Iebd1adaf25a178502f26e946300fef8f1e37f788