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

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

Change-Id: Ia6babeacdce7368422c1cc194ad58aeaa7e38006