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

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



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