Merge changes from topic "am-459940e72e044b8eb4542a9e6ab2697a"

* changes:
  [automerger skipped] Merge changes from topic "am-9386409e3b7d4599ba7fc5332a9434f8" into tm-qpr-dev-plus-aosp am: a3a609ca -s ours am: 7efe4626 -s ours am: 44f448a3 -s ours
  [automerger skipped] Use PendingIntent for media click action over lockscreen am: 223e9c58 am: 75f57c45 -s ours am: 99ad7f0a -s ours am: 66f2dd34 -s ours am: 9f1b15d9 -s ours am: 2e3bf5ba -s ours