Merge "Avoid reentrant callback when setting up listeners" into rvc-dev am: 118966e45c am: 40f1fc932c am: a7c1fe8789 am: 2bf3dea280

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

Change-Id: Idd283f5328865625c7b3f5dcb0e5d5406b151b84