[automerger skipped] Merge "Revert "Moving smartspace to the right on the lockscreen for split shade"" into sc-v2-dev am: f8503766 am: f9646b05 -s ours

am skip reason: Merged-In I6247289495d39c7f216d90a7de5227b9daa56a44 with SHA-1 b0eb8cf0 is already in history

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

Change-Id: I241d6c7a6b56ac2c06cad7ff8a437df7d8cb9c1c