Merge "More cleanly separate requests and listens." am: b46257ecff am: 05bf3641ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee85ef5889b9bd4ca72115499ac94c8abeb4feb2