Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: 18b58726dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019 Change-Id: Idddab6d7d713cce0e1d0935b29f105bc2ade64f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: