Merge "Replace PendingIntent#getIntent" am: dd010bff79 am: 601630120d am: 22e1b06884

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d5fd57b053418db5e7a2cbd48f23945b350ccc