Merge "Use PendingIntent for media click action over lockscreen" into...

Merge "Use PendingIntent for media click action over lockscreen" into tm-qpr-dev am: 4dd83882 am: 5eed9cae am: be454822

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



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