Merge "Update logic about parent and convo channels" into sc-dev am: b87598c3cc am: 8c497473a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907947 Change-Id: If8f32648d59a51e87e419612d29addb5853d0b71
This commit is contained in: