[automerger skipped] Merge "Update screensaver preference summary when on."...

[automerger skipped] Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625 am: ef4fb099 -s ours

am skip reason: Merged-In I40483f266c42a6e49e513208ba513d469d67f85a with SHA-1 adb864a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706



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