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

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



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