Merge "Fix a bug where listen callbacks would not be called" am: d36130f759

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14a640aa21b464e7d6ced3086986e0dd79eaa019