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

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

Change-Id: I9283b3e0660abcf484e850e841353cab31abcb36