Merge "Update home controls button on keyguard" into tm-qpr-dev am: 9f632242 am: 293cf801

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



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