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

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



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