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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I216167c2809ddc12e4a92faedf3bb4dc5c1a56cb
tree: b4e67eb8024bf586bcc2d0e16ae225f547fb0f02
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS