Merge "Tap convo avatar to expand/collapse" into rvc-dev am: 254b6cbd am:...

Merge "Tap convo avatar to expand/collapse" into rvc-dev am: 254b6cbd am: a05d793f am: 21b38545

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

Change-Id: I10cc91061c949137bde12b00712c65af922b72cb