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 am: 2f9d9f02

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

Change-Id: Ia0b46c6151e7597e4e3ef83571e8b32fbcc7752d