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

Merge "Merge "Disable dreams home controls button when disabled on lockscreen" into udc-dev am: 68aff1a3 am: 6ff12251 am: 641b28d9" into udc-qpr-dev-plus-aosp am: f2fc8b0e

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



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