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 am: 5814d331

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

Change-Id: Ia6f5e86d96dbdde69f991b617102fed34e93a34b