Merge "More cleanly separate requests and listens." am: 7a4c248582 am: 80fbe908e8 am: 580ed937dd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I859c265fb73352cc8e0c2db5cdd119644c230dd3