Merge "Update ActivityIntentHelper to use PendingIntents directly" into tm-qpr-dev am: 78b2b5567c

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

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