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

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

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



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