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

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

Change-Id: I134bd5f89973e242f7b75f2baa4617e8ad1cb644