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: e71705b0 am: 5e003164 am: 9deef7b5

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



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