Merge "Fix a bug where listen callbacks would not be called" am: 3b50ce7a6f am: d7e0f35a90

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2edd1b12be6d2b1cb3c8bc4fdecd83364c813301