Merge "Fix switching "Swipe down from Show notification" to "Pull screen into reach" will not able to trigger it at first time" into sc-v2-dev am: 323e305540 am: af394e05a3

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

Change-Id: I5fb8fa03d8b627b963e9a19345894eafbdfea58d