Merge changes from topic "am-9386409e3b7d4599ba7fc5332a9434f8" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Use PendingIntent for media click action over lockscreen am: 223e9c58 am: 75f57c45 -s ours am: 99ad7f0a -s ours
  [automerger skipped] Update ActivityIntentHelper to use PendingIntents directly am: 3ee3b7a2 am: 8dfe2fbc -s ours am: 5290b8db -s ours