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

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

Change-Id: I440bcf128826e09fd0324b8c342a6b49a2a6196e