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: 6ff12251 am: 641b28d9

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



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