Merge "Merge "Tap convo avatar to expand/collapse" into rvc-dev am: 254b6cbd am: 4d1eb4fd" into rvc-d1-dev-plus-aosp am: cd23d92a am: 5d35c031

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

Change-Id: I5835381ca3ffe3c18af10befd243bdc68afbe6af