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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14a640aa21b464e7d6ced3086986e0dd79eaa019
tree: 82a320be3ec55bc3eca3391d9e467e45b8a9ace7
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS