Merge "Merge "Disable dreams home controls button when disabled on lockscreen." into udc-dev am: 5bce93eb17
am: 975b03405f
am: 848c4689b7" into udc-qpr-dev-plus-aosp am: 48e7fe9878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23321459 Change-Id: I8972bc4a16b903cbf3af338898ff130dba9eba20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: