Merge "Fix affordance in lockscreen and dream" into tm-qpr-dev am: a1bd51fc am: 672dbc5a

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



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