Merge "Add media on lock screen setting" into tm-qpr-dev am: c24db189 am: 5228968a

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



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