Merge "Read setting media show on lockscreen" into tm-qpr-dev am: d2787bc5

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



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