Merge "More cleanly separate requests and listens." am: d301e60ccf am: 1ffc1b670f am: 580ed937dd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I859c265fb73352cc8e0c2db5cdd119644c230dd3
tree: 3f72a13e85040a92deb8f852d24f351746a96991
  1. framework/
  2. service/
  3. OWNERS