Merge "Disable dreams home controls button when disabled on lockscreen" into udc-dev am: 68aff1a3

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



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