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 am: 4230a055

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

Change-Id: I1f9814117187d712c4e5df8140d6ff62f06ebdf3