Merge "Expose pending request to subclasses and ensure clean up" am:...

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

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



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