[automerger skipped] Update ActivityIntentHelper to use PendingIntents...

[automerger skipped] Update ActivityIntentHelper to use PendingIntents directly am: 3ee3b7a2 am: 8dfe2fbc -s ours am: 5290b8db -s ours

am skip reason: Merged-In I0dd32765755732a7a9141e3be2b04b7eed696928 with SHA-1 6b780315 is already in history

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



Change-Id: I5b1fc76b87586c95d919391bbf39c62093a3f466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>