Merge "Add screensaver home control setting" into tm-qpr-dev am: 9b98c8e9

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



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