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

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



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