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: 4d1eb4fd am: ee3625d9 am: bb5a3586

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

Change-Id: Ia92707eecf7f716bad4c432570aa17cd1768f437