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: b0107001

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



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