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

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



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