Merge "Fix lockscreen shortcuts not showing on split shade" into tm-qpr-dev...

Merge "Fix lockscreen shortcuts not showing on split shade" into tm-qpr-dev am: ff8fc64f am: f9e5a700 am: b929cf7f am: ddb59e7e

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



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