Merge "Merge "Prevent swipe-to-dismiss conversation header" into rvc-dev am:...

Merge "Merge "Prevent swipe-to-dismiss conversation header" into rvc-dev am: e91a027e am: 891fba38 am: bacf3a26" into rvc-qpr-dev-plus-aosp am: c9b4b797

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

Change-Id: Ica70589f718bfa1569e382990566c573a6d39706