Merge "Update swipe up from the locked shade behavior" into sc-v2-dev am: 6525d66b am: c1448554

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

Change-Id: Id99436735e30965f7d1fc88521bc527286192dba