Merge "Prevent touch event dispatch on the top edge when collapsed" into tm-qpr-dev am: e3544779

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



Change-Id: I73bfd249e648c8fded02e4da5ab3ff5926f695c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>