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

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

Change-Id: I89615cfa7bd31822f13fd32a27d3de61cdb02791