Merge "Prevent touch event dispatch on the top edge when collapsed" into...

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

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



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