Merge "Replace PendingIntent @hide APIs" am: 1cec9a2671 am: 97adf1f334 am: 17e6bc6a4c

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

Change-Id: I837c5cd9ebc46e350e3c7950323614df4cbc38f3