Merge "Fix Conversation widget on new notif pipeline" into tm-dev am: 1e6d8d69 am: 62946ea7

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



Change-Id: I0583679cb11e869672cea2819a021181e638e607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>