Merge "Disable dreams home controls button when disabled on lockscreen" into...

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

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



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