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

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

Change-Id: I6f3a1e221d9ce57947ff14c3f5b17a50e0e5d40f