Merge changes from topic "expose-pending-intent" into stage-aosp-master am:...

Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d1 am: 78f1a9bf

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

Change-Id: I66a50ffbae15636a6a2221f1b27b2449b724a26b