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

Merge "Prevent swipe-to-dismiss conversation header" into rvc-dev am: e91a027e am: 3963a735 am: 581b24ce

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

Change-Id: I183226d809711140eaa61bbec872e174adb37e96