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

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



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