Merge "Fix a bug where listen callbacks would not be called" am: d36130f759 am: 2d51f15105 am: 0a07cc6615

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216167c2809ddc12e4a92faedf3bb4dc5c1a56cb