Merge "Fixed a crash when dragging down on the NotificationShelf" into sc-v2-dev am: 6334c5c03b

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

Change-Id: I35956e2598911dcd75dbb8d40ac559273309af36