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

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

Change-Id: I18693b621bcae7a011719324bd8bede302d22efb