Merge "Expose pending request to subclasses and ensure clean up" am: a5cb050a am: 729033b5

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



Change-Id: I93e50de8c243bb9a7424eea6c8688f483d558815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>