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

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

Change-Id: I617f1e422eba270fa07bac7218a8858f4f41da2f